diff --git a/.github/workflows/extract-wheels.sh b/.github/workflows/extract-wheels.sh
deleted file mode 100755
index f5f5302..0000000
--- a/.github/workflows/extract-wheels.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-for ver in 37 38 39 310 311; do
-  dockerid=$(docker create python-casacore-py${ver})
-  docker cp ${dockerid}:/output/ output-${ver}
-  docker rm ${dockerid}
-done
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 2adf36c..e2cae6d 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -9,17 +9,11 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-20.04
-#    continue-on-error: true
     strategy:
       matrix:
         dist:
-#          - pep8
-#          - mypy
-#          - py2_kern6
-#          - py3_kern6
           - py3_kern7
           - py3_casacore_master
-#          - py3_casacore_v3.3
           - py3_casacore_v3.4
     steps:
       - name: Checkout
@@ -29,30 +23,3 @@ jobs:
         run: docker build . -t ${{ matrix.dist }} -f .github/workflows/${{ matrix.dist }}.docker
 
 
-#  wheels:
-#    runs-on: ubuntu-20.04
-#    continue-on-error: true
-#    strategy:
-#      matrix:
-#        dist:
-#          - py36_binary_wheel
-#          - py37_binary_wheel
-#          - py38_binary_wheel
-#          - py39_binary_wheel
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v2
-#
-#      - name: Build container
-#        run: docker build . -t ${{ matrix.dist }} -f .github/workflows/${{ matrix.dist }}.docker
-#
-#      - name: Get wheel
-#        run: |
-#          mkdir -p bridge
-#          docker run -v `pwd`/bridge:/bridge ${{ matrix.dist }} sh -c "cp /output/*.whl /bridge/."
-#
-#      - uses: actions/upload-artifact@v2
-#        name: Publish Linux binary wheels
-#        with:
-#          path: bridge/*.whl
-#
diff --git a/.github/workflows/make_images.sh b/.github/workflows/make_images.sh
deleted file mode 100755
index 0095122..0000000
--- a/.github/workflows/make_images.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash -ve
-
-HERE=`dirname "$0"`
-cd $HERE/..
-
-for i in 37 38 39 310 311; do
-    docker build -f docker/py${i}_wheel.docker . -t quay.io/casacore/casacore:master_wheel${i}
-done
diff --git a/.github/workflows/mypy.docker b/.github/workflows/mypy.docker
deleted file mode 100644
index 0aa2a30..0000000
--- a/.github/workflows/mypy.docker
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM kernsuite/base:7
-RUN docker-apt-install python3-pip
-RUN pip3 install mypy
-ADD . /src
-WORKDIR /src
-RUN mypy --ignore-missing-imports casacore
-
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
index 57c766e..cfaf074 100644
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@@ -34,7 +34,7 @@ jobs:
         run: venv/bin/pytest
 
       - name: make binary wheel
-        run: venv/bin/python3 setup.py bdist_wheel
+        run: venv/bin/pip wheel -w dist .
 
       - name: Delocate binary wheel
         run: venv/bin/delocate-wheel -v dist/*.whl
diff --git a/.github/workflows/pep8.docker b/.github/workflows/pep8.docker
deleted file mode 100644
index f2856e2..0000000
--- a/.github/workflows/pep8.docker
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM kernsuite/base:7
-RUN docker-apt-install python3-pip
-RUN pip3 install pycodestyle
-ADD . /src
-WORKDIR /src
-RUN pycodestyle casacore --ignore=E501
-
diff --git a/.github/workflows/py2_kern6.docker b/.github/workflows/py2_kern6.docker
deleted file mode 100644
index 7a3dd76..0000000
--- a/.github/workflows/py2_kern6.docker
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM kernsuite/base:6
-RUN docker-apt-install \
-    casacore-data \
-    casacore-dev \
-    libboost-python-dev \
-    libcasa-python5 \
-    libcfitsio-dev \
-    wcslib-dev \
-    python-dev \
-    python-numpy \
-    python-setuptools \
-    python-six \
-    python-pip \
-    python-nose 
-ADD . /src
-WORKDIR /src
-RUN pip install -e .
-RUN pip install -r tests/requirements.txt
-RUN nosetests --with-coverage --verbose --cover-package=casacore
diff --git a/.github/workflows/py310_binary_wheel.docker b/.github/workflows/py310_binary_wheel.docker
deleted file mode 100644
index 480dbb2..0000000
--- a/.github/workflows/py310_binary_wheel.docker
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM quay.io/casacore/casacore:master_wheel310
-
-ADD . /python-casacore
-WORKDIR /python-casacore
-ENV CFLAGS "-I/opt/boost/include -L/opt/boost/lib -I/usr/include/cfitsio"
-ENV LD_LIBRARY_PATH "/opt/boost/lib:/usr/local/lib"
-RUN /opt/python/${TARGET}/bin/python ./setup.py build_ext -j${THREADS}
-RUN /opt/python/${TARGET}/bin/python ./setup.py bdist_wheel -d .
-RUN auditwheel repair --plat manylinux2014_x86_64 -w /output *.whl
diff --git a/.github/workflows/py311_binary_wheel.docker b/.github/workflows/py311_binary_wheel.docker
deleted file mode 100644
index 21538bb..0000000
--- a/.github/workflows/py311_binary_wheel.docker
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM quay.io/casacore/casacore:master_wheel311
-
-ADD . /python-casacore
-WORKDIR /python-casacore
-ENV CFLAGS "-I/opt/boost/include -L/opt/boost/lib -I/usr/include/cfitsio"
-ENV LD_LIBRARY_PATH "/opt/boost/lib:/usr/local/lib"
-RUN /opt/python/${TARGET}/bin/python ./setup.py build_ext -j${THREADS}
-RUN /opt/python/${TARGET}/bin/python ./setup.py bdist_wheel -d .
-RUN auditwheel repair --plat manylinux2014_x86_64 -w /output *.whl
diff --git a/.github/workflows/py37_binary_wheel.docker b/.github/workflows/py37_binary_wheel.docker
deleted file mode 100644
index c7d682d..0000000
--- a/.github/workflows/py37_binary_wheel.docker
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM quay.io/casacore/casacore:master_wheel37
-
-ADD . /python-casacore
-WORKDIR /python-casacore
-ENV CFLAGS "-I/opt/boost/include -L/opt/boost/lib -I/usr/include/cfitsio"
-ENV LD_LIBRARY_PATH "/opt/boost/lib:/usr/local/lib"
-RUN /opt/python/${TARGET}/bin/python ./setup.py build_ext -j${THREADS}
-RUN /opt/python/${TARGET}/bin/python ./setup.py bdist_wheel -d .
-RUN auditwheel repair --plat manylinux2014_x86_64 -w /output *.whl
diff --git a/.github/workflows/py38_binary_wheel.docker b/.github/workflows/py38_binary_wheel.docker
deleted file mode 100644
index 38f291f..0000000
--- a/.github/workflows/py38_binary_wheel.docker
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM quay.io/casacore/casacore:master_wheel38
-
-ADD . /python-casacore
-WORKDIR /python-casacore
-ENV CFLAGS "-I/opt/boost/include -L/opt/boost/lib -I/usr/include/cfitsio"
-ENV LD_LIBRARY_PATH "/opt/boost/lib:/usr/local/lib"
-RUN /opt/python/${TARGET}/bin/python ./setup.py build_ext -j${THREADS}
-RUN /opt/python/${TARGET}/bin/python ./setup.py bdist_wheel -d .
-RUN auditwheel repair --plat manylinux2014_x86_64 -w /output *.whl
diff --git a/.github/workflows/py39_binary_wheel.docker b/.github/workflows/py39_binary_wheel.docker
deleted file mode 100644
index 709d4df..0000000
--- a/.github/workflows/py39_binary_wheel.docker
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM quay.io/casacore/casacore:master_wheel39
-
-ADD . /python-casacore
-WORKDIR /python-casacore
-ENV CFLAGS "-I/opt/boost/include -L/opt/boost/lib -I/usr/include/cfitsio"
-ENV LD_LIBRARY_PATH "/opt/boost/lib:/usr/local/lib"
-RUN /opt/python/${TARGET}/bin/python ./setup.py build_ext -j${THREADS}
-RUN /opt/python/${TARGET}/bin/python ./setup.py bdist_wheel -d .
-RUN auditwheel repair --plat manylinux2014_x86_64 -w /output *.whl
diff --git a/.github/workflows/py3_casacore_v3.3.docker b/.github/workflows/py3_casacore_v3.3.docker
deleted file mode 100644
index 07fdc5c..0000000
--- a/.github/workflows/py3_casacore_v3.3.docker
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM quay.io/casacore/casacore:v3.3
-USER root
-RUN docker-apt-install \
-    libboost-python-dev \
-    libcfitsio-dev \
-    wcslib-dev \
-    python3-all \
-    python3-dev \
-    python3-numpy \
-    python3-setuptools \
-    python3-six \
-    python3-pip \
-    python3-nose
-ADD . /src
-WORKDIR /src
-RUN pip3 install -e .
-RUN pip3 install -r tests/requirements.txt
-RUN nosetests3 --with-coverage --verbose --cover-package=casacore
diff --git a/.github/workflows/py3_kern6.docker b/.github/workflows/py3_kern6.docker
deleted file mode 100644
index 16f79df..0000000
--- a/.github/workflows/py3_kern6.docker
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM kernsuite/base:6
-RUN docker-apt-install \
-    casacore-data \
-    casacore-dev \
-    libboost-python-dev \
-    libcasa-python3-5 \
-    libcfitsio-dev \
-    wcslib-dev \
-    python3-all \
-    python3-dev \
-    python3-numpy \
-    python3-setuptools \
-    python3-six \
-    python3-pip \
-    python3-nose
-ADD . /src
-WORKDIR /src
-RUN pip3 install -e .
-RUN pip3 install -r tests/requirements.txt
-RUN nosetests3 --with-coverage --verbose --cover-package=casacore