diff --git a/assembly_improvement/README.md b/assembly_improvement/README.md
deleted file mode 100644
index c38b5b6..0000000
--- a/assembly_improvement/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Assembly Improvement
-
-[![Container source](https://img.shields.io/static/v1?label=Container%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/MillironX/singularity-builds/tree/master/assembly_improvement)
-[![assembly_improvement source](https://img.shields.io/static/v1?label=assembly_improvement%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/sanger-pathogens/assembly_improvement)
-[![Version 1.160490](https://img.shields.io/static/v1?label=Latest%20version&message=1.160490&color=yellowgreen&logo=linuxcontainers&style=flat-square)](https://cloud.sylabs.io/library/millironx/default/assembly_improvement)
-[![Docs](https://img.shields.io/static/v1?label=Docs&message=README&color=blue&style=flat-square)](https://github.com/sanger-pathogens/assembly_improvement/blob/master/README.md)
-[![CentOS base](https://img.shields.io/static/v1?label=Base%20image&message=CentOS&color=9fcf32&logo=centos&style=flat-square)](https://www.centos.org/)
-
-Take in an assembly in FASTA format, reads in FASTQ format, and make the
-assembly better by scaffolding and gap filling.
-
-## Tools installed
-
-### SSPACE
-
-- `SSPACE_Basic.pl`
-
-### GapFiller
-
-- `GapFiller`
-
-### Abacas
-
-- `abacas.pl`
-
-### SGA
-
-- `sga`
-
-### improve_assembly
-
-- `improve_assembly`
-- `diginorm_with_khmer`
-- `fill_gaps_with_gapfiller`
-- `order_contigs_with_abacas`
-- `read_correction_with_sga`
-- `scaffold_with_sspace`
diff --git a/assembly_improvement/assembly_improvement.def b/assembly_improvement/assembly_improvement.def
deleted file mode 100644
index a6458a6..0000000
--- a/assembly_improvement/assembly_improvement.def
+++ /dev/null
@@ -1,173 +0,0 @@
-Bootstrap: library
-From: default/centos:latest
-
-%post
-  # Quiet perl down
-  export LC_ALL=C
-
-  # Install package files: repositories
-  dnf install dnf-plugins-core -y
-  dnf install epel-release -y
-  dnf config-manager --set-enabled PowerTools
-
-  # Operating dependencies
-  dnf --setopt=install_weak_deps=False install procps perl python3 which -y
-
-  # Building dependencies
-  dnf groupinstall 'Development Tools' -y
-  dnf install perl-App-cpanminus boost-devel cmake jsoncpp-devel jemalloc-devel expat-devel -y
-
-  # Install SSPACE
-  cd /opt || exit 1
-  git clone https://github.com/nsoranzo/sspace_basic.git
-  cd sspace_basic || exit 1
-  git checkout 4fe5c # Not available as release tarball
-  cd || exit 1
-  export PATH=$PATH:/opt/sspace_basic
-
-  # Install GapFiller
-  curl -L https://downloads.sourceforge.net/project/gapfiller/v2.1.2/gapfiller-2.1.2.tar.gz | tar xvz
-  cd gapfiller-2.1.2
-  ./configure
-  make && make install
-  cd .. || exit 1
-  rm -rf gapfiller-2.1.2
-
-  # Install khmer
-  pip3 install khmer
-
-  # Install MUMmer
-  curl -L https://github.com/mummer4/mummer/releases/download/v4.0.0rc1/mummer-4.0.0rc1.tar.gz | tar xvz
-  cd mummer-4.0.0rc1 || exit 1
-  ./configure
-  make && make install
-  cd .. || exit 1
-  rm -rf mummer-4.0.0rc1
-
-  # SGA uses an old C++ standard, so all of its dependencies must be compiled
-  # against that standard, too
-  export CFLAGS=-std=gnu++03
-  export CXXFLAGS=-std=gnu++03
-  export CPPFLAGS=-std=gnu++03
-
-  # Install Google sparsehash (dependency for SGA)
-  curl -L https://github.com/sparsehash/sparsehash/archive/refs/tags/sparsehash-2.0.4.tar.gz | tar xvz
-  cd sparsehash-sparsehash-2.0.4 || exit 1
-  ./configure
-  make && make install
-  cd .. || exit 1
-  rm -rf sparsehash-sparsehash-2.0.4
-
-  # Install bamtools library (dependency for SGA)
-  curl -L https://github.com/pezmaster31/bamtools/archive/refs/tags/v2.5.2.tar.gz | tar xvz
-  cd bamtools-2.5.2 || exit 1
-  mkdir build && cd build || exit 1
-  # Dependency issue unique to RHEL/CentOS 8: https://github.com/ComplianceAsCode/content/issues/7016#issuecomment-845066366
-  dnf upgrade libarchive -y
-  cmake ..
-  make && make install
-  cd ../.. || exit 1
-  rm -rf bamtools-2.5.2
-
-  # Install ruffus (dependency for SGA)
-  pip3 install ruffus --upgrade
-
-  # Install pysam (dependency for SGA)
-  pip3 install pysam
-
-  # Install SGA
-  git clone https://github.com/jts/sga.git
-  cd sga/src || exit 1
-  git checkout 229293b # Contains compiler-blocking bug fixes that are not in the release tarball
-  ./autogen.sh
-  ./configure --with-bamtools=/usr/local
-  make && make install
-  cd ../.. || exit 1
-  rm -rf sga
-
-  # Unset the compiler flags
-  export CFLAGS=''
-  export CXXFLAGS=''
-  export CPPFLAGS=''
-
-  # QUASR is nowhere to be found, so skip installing it
-
-  # Install assembly_improvement's dependencies
-  cpanm -f Bio::AssemblyImprovement
-
-  # Install an up-to-date version of assembly_improvement
-  cd /opt || exit 1
-  curl -L https://github.com/sanger-pathogens/assembly_improvement/releases/download/v2021.01.04.08.24.00.726/Bio_AssemblyImprovement-2021.01.04.08.24.00.726.tar.gz | tar xvz
-  export PATH=$PATH:/opt/Bio_AssemblyImprovement-2021.01.04.08.24.00.726/bin
-  cd || exit 1
-
-  # Shim preloaded arguments into PATH
-  IMPROVE_PREFIX=/opt/Bio_AssemblyImprovement-2021.01.04.08.24.00.726/bin
-  SSPACE_PATH=/opt/sspace_basic/SSPACE_Basic.pl
-  GF_PATH=/usr/local/bin/GapFiller
-  ABACAS_PATH=/usr/local/bin/abacas.pl
-  SGA_PATH=/usr/local/bin/sga
-  cd /opt || exit 1
-  mkdir shims && cd shims || exit 1
-  echo "$IMPROVE_PREFIX/improve_assembly -s $SSPACE_PATH -g $GF_PATH -b $ABACAS_PATH \"\$@\"" > improve_assembly
-  echo "$IMPROVE_PREFIX/diginorm_with_khmer -py /usr/bin/python3 \"\$@\"" > diginorm_with_khmer
-  echo "$IMPROVE_PREFIX/fill_gaps_with_gapfiller -s $GF_PATH \"\$@\"" > fill_gaps_with_gapfiller
-  echo "$IMPROVE_PREFIX/order_contigs_with_abacas -b $ABACAS_PATH \"\$@\"" > order_contigs_with_abacas
-  echo "$IMPROVE_PREFIX/read_correction_with_sga -s $SGA_PATH \"\$@\"" > read_correction_with_sga
-  echo "$IMPROVE_PREFIX/scaffold_with_sspace -s $SSPACE_PATH \"\$@\"" > scaffold_with_sspace
-  echo "echo 'Error! QUASR is discontinued and not available in this container.'; exit 1" > remove_primers_with_quasr
-  chmod +x ./*
-  cd || exit 1
-  export PATH=/opt/shims:$PATH
-
-  # Clean up
-  dnf groupremove 'Development Tools' -y
-  dnf remove perl-App-cpanminus boost-devel cmake jsoncpp-devel jemalloc-devel expat-devel -y
-  dnf autoremove -y
-  dnf clean all
-
-%environment
-  export LC_ALL=C
-  export PATH=$PATH:/opt/sspace_basic
-  export PATH=$PATH:/opt/Bio_AssemblyImprovement-2021.01.04.08.24.00.726/bin
-  export PATH=/opt/shims:$PATH
-
-%test
-  # We can use bash notation here, since /bin/sh is symlinked to bash in CentOS
-  CMDS=('bash' 'ps' 'SSPACE_Basic.pl' 'GapFiller' 'abacas.pl' 'sga' 'improve_assembly' 'diginorm_with_khmer' 'fill_gaps_with_gapfiller' 'order_contigs_with_abacas' 'read_correction_with_sga' 'scaffold_with_sspace')
-  for CMD in "${CMDS[@]}"; do
-    if ! command -v "$CMD"; then
-      echo "command $CMD not found!"
-      FAILED_TESTS=1
-    fi
-  done
-  # Abort if a test failed
-  if [ -n "$FAILED_TESTS" ]; then
-    exit 1
-  fi
-
-%runscript
-  /opt/Bio_AssemblyImprovement-2021.01.04.08.24.00.726/bin/improve_assembly -s /opt/sspace_basic/SSPACE_Basic.pl -g /usr/local/bin/GapFiller -b /usr/local/bin/abacas.pl "$@"
-
-%labels
-  Author 25492070+MillironX@users.noreply.github.com
-  SoftwareVersion 1.160490
-  SingularityDefinitionVersion 2
-
-%help
-  Assembly Improvement
-  ====================
-
-  Take in an assembly in FASTA format, reads in FASTQ format, and make the
-  assembly better by scaffolding and gap filling.
-
-  **NOTE:** When using this container, **do not** use options that point to the
-  paths of binaries. These have already been included in the container, and
-  shims are setup to point to the containerized binaries already.
-  E.g. `improve_assembly` is shimmed to execute
-  `improve_assembly -s /opt/sspace_basic/SSPACE_Basic.pl -g /usr/local/bin/GapFiller -b /usr/local/bin/abacas.pl "$@"`,
-  so providing `-s`, `-g`, or `-b` will break the usage.
-
-  For more help, see
-  - <https://github.com/sanger-pathogens/assembly_improvement>
-  - <https://github.com/MillironX/singularity-builds>
diff --git a/clique-snv/README.md b/clique-snv/README.md
deleted file mode 100644
index c8312c2..0000000
--- a/clique-snv/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# CliqueSNV
-
-[![Container source](https://img.shields.io/static/v1?label=Container%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/MillironX/singularity-builds/tree/master/clique-snv)
-[![CliqueSNV source](https://img.shields.io/static/v1?label=CliqueSNV%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/vtsyvina/CliqueSNV)
-[![Version 2.0.2](https://img.shields.io/static/v1?label=Latest%20version&message=2.0.2&color=yellowgreen&logo=linuxcontainers&style=flat-square)](https://cloud.sylabs.io/library/millironx/default/clique-snv)
-[![Docs](https://img.shields.io/static/v1?label=Docs&message=README&color=blue&style=flat-square)](https://github.com/vtsyvina/CliqueSNV/blob/master/README.md)
-[![Alpine base](https://img.shields.io/static/v1?label=Base%20image&message=Alpine&color=0d597f&logo=alpinelinux&style=flat-square)](https://www.alpinelinux.org/)
-
-CliqueSNV can identify minority haplotypes based on extracting pairs of statistically linked mutations from noisy reads.
-
-## Tools installed
-
-### CliqueSNV
-
-- `java`
-- `clique-snv` as alias for `java -jar clique-snv.jar ...`
diff --git a/clique-snv/clique-snv.def b/clique-snv/clique-snv.def
deleted file mode 100644
index 7889cfb..0000000
--- a/clique-snv/clique-snv.def
+++ /dev/null
@@ -1,57 +0,0 @@
-Bootstrap: library
-From: default/alpine:3.14.0
-
-%post
-  # Install java
-  apk add --no-cache openjdk8 bash
-
-  # Make versioning easier
-  CLIQUE_VERSION=2.0.2
-
-  cd /opt
-  wget https://github.com/vtsyvina/CliqueSNV/archive/refs/tags/$CLIQUE_VERSION.tar.gz -O cliquesnv.tar.gz
-  tar xvzf cliquesnv.tar.gz
-  rm cliquesnv.tar.gz
-  cd
-
-  {
-    echo "#!/bin/bash"
-    echo "java -jar /opt/CliqueSNV-$CLIQUE_VERSION/clique-snv.jar \"\$@\""
-  } > /usr/bin/clique-snv
-  chmod +x /usr/bin/clique-snv
-
-%test
-  test_command () {
-    if ! command -v "${1}"; then
-      echo "command ${1} not found!"
-      export FAILED_TESTS=1
-    fi
-  }
-
-  test_command bash
-  test_command ps
-  test_command java
-  test_command clique-snv
-
-  if [ -n "$FAILED_TESTS" ]; then
-    exit 1
-  fi
-
-%runscript
-  clique-snv "$@"
-
-%labels
-  Author 25492070+MillironX@users.noreply.github.com
-  SoftwareVersion 2.0.2
-  SingularityDefinitionVersion 1
-
-%help
-  CliqueSNV
-  =========
-
-  CliqueSNV can identify minority haplotypes based on extracting pairs of
-  statistically linked mutations from noisy reads.
-
-  For more help, see
-  - <https://github.com/vtsyvina/CliqueSNV>
-  - <https://github.com/MillironX/singularity-builds>
diff --git a/htslib/README.md b/htslib/README.md
deleted file mode 100644
index 2b1c309..0000000
--- a/htslib/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# HTSLib
-
-[![Container source](https://img.shields.io/static/v1?label=Container%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/MillironX/singularity-builds/tree/master/htslib)
-[![VarScan source](https://img.shields.io/static/v1?label=HTSlib%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/samtools/htslib)
-[![Version 1.13](https://img.shields.io/static/v1?label=Latest%20version&message=1.13&color=yellowgreen&logo=linuxcontainers&style=flat-square)](https://cloud.sylabs.io/library/millironx/default/htslib)
-[![Docs](https://img.shields.io/static/v1?label=Docs&message=web&color=blue&style=flat-square)](https://www.htslib.org/)
-[![Alpine base](https://img.shields.io/static/v1?label=Base%20image&message=Alpine&color=0d597f&logo=alpinelinux&style=flat-square)](https://www.alpinelinux.org/)
-
-HTSlib is an implementation of a unified C library for accessing common file formats, such as SAM, CRAM and VCF, used for high-throughput sequencing data, and is the core library used by samtools and bcftools.
-
-## Tools installed
-
-none
diff --git a/htslib/htslib.def b/htslib/htslib.def
deleted file mode 100644
index de40774..0000000
--- a/htslib/htslib.def
+++ /dev/null
@@ -1,57 +0,0 @@
-Bootstrap: library
-From: default/alpine:3.14.0
-
-%post
-  # Get the actual dependencies
-  apk add --no-cache zlib bash libcurl
-
-  # Get the build dependencies
-  apk add --no-cache --virtual .build-deps musl-dev g++ make zlib-dev bzip2-dev xz-dev curl-dev
-
-  # Make versioning easier
-  HTSLIB_VERSION='1.13'
-
-  # Download the source tarball and build
-  cd /tmp || exit 1
-  wget https://github.com/samtools/htslib/releases/download/$HTSLIB_VERSION/htslib-$HTSLIB_VERSION.tar.bz2
-  tar xjvf htslib-$HTSLIB_VERSION.tar.bz2
-  cd htslib-$HTSLIB_VERSION || exit 1
-  make && make install
-  cd .. || exit 1
-  rm -rf htslib-$SAMTOOLS_VERSION*
-  cd || exit 1
-
-  # Cleanup build packages
-  apk del --no-cache .build-deps
-
-%test
-  test_command () {
-    if ! command -v "${1}"; then
-      echo "command ${1} not found!"
-      export FAILED_TESTS=1
-    fi
-  }
-
-  test_command bash
-  test_command ps
-
-  if [ -n "$FAILED_TESTS" ]; then
-    exit 1
-  fi
-
-%labels
-  Author 25492070+MillironX@users.noreply.github.com
-  SoftwareVersion 1.13
-  SingularityDefinitionVersion 2
-
-%help
-  HTSlib
-  ======
-
-  HTSlib is an implementation of a unified C library for accessing common file
-  formats, such as SAM, CRAM and VCF, used for high-throughput sequencing data,
-  and is the core library used by samtools and bcftools.
-
-  For more help, see
-  - <https://www.htslib.org>
-  - <https://github.com/MillironX/singularity-builds>
diff --git a/julia/Dockerfile b/julia/Dockerfile
deleted file mode 100644
index 4842180..0000000
--- a/julia/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM julia:1.6.2-alpine
-
-RUN apk add --no-cache bash
-
-CMD ["julia"]
diff --git a/julia/README.md b/julia/README.md
deleted file mode 100644
index 787f50c..0000000
--- a/julia/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Julia
-
-[![Container source](https://img.shields.io/static/v1?label=Container%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/MillironX/singularity-builds/tree/master/julia)
-[![Julia source](https://img.shields.io/static/v1?label=Julia%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/JuliaLang/julia)
-[![Version 1.160490](https://img.shields.io/static/v1?label=Latest%20version&message=1.6.2&color=yellowgreen&logo=linuxcontainers&style=flat-square)](https://cloud.sylabs.io/library/millironx/default/assembly_improvement)
-[![Docs](https://img.shields.io/static/v1?label=Docs&message=web&color=blue&style=flat-square)](https://docs.julialang.org/en/v1.6.2/)
-[![Alpine base](https://img.shields.io/static/v1?label=Base%20image&message=Alpine&color=0d597f&logo=alpinelinux&style=flat-square)](https://www.alpinelinux.org/)
-
-Julia is a high-level dynamic programming language designed to address the needs of high-performance numerical analysis and computational science. It provides a sophisticated compiler, distributed parallel execution, numerical accuracy, and an extensive mathematical function library.
-
-## Tools installed
-
-### Julia
-
-- `julia`
diff --git a/julia/julia.def b/julia/julia.def
deleted file mode 100644
index 03211a2..0000000
--- a/julia/julia.def
+++ /dev/null
@@ -1,85 +0,0 @@
-Bootstrap: library
-From: default/alpine:3.14.0
-
-%post
-  # Install dependencies
-  apk add --no-cache bash
-  apk add --no-cache --virtual .build-deps gnupg curl
-
-  # Make our lives easier by declaring some constants
-  export JULIA_GPG="3673DF529D9049477F76B37566E3C7DC03D6E495"
-  export JULIA_VERSION="1.6.2"
-  export JULIA_PATH=/usr/local/julia
-  export PATH=$JULIA_PATH/bin:$PATH
-  export tarArch='x86_64'
-  export dirArch='x64'
-  export sha256='5ff279bc733a99a9582fd9b39eb3d18a3fa77b9d3d2733039279a250c8c5d49c'
-
-  # Download Julia
-  export folder="$(echo "$JULIA_VERSION" | cut -d. -f1-2)"
-  curl -fL -o julia.tar.gz.asc "https://julialang-s3.julialang.org/bin/musl/${dirArch}/${folder}/julia-${JULIA_VERSION}-musl-${tarArch}.tar.gz.asc"
-  curl -fL -o julia.tar.gz     "https://julialang-s3.julialang.org/bin/musl/${dirArch}/${folder}/julia-${JULIA_VERSION}-musl-${tarArch}.tar.gz"
-
-  # Security check step 1: verify via sha256
-  echo "${sha256} *julia.tar.gz" | sha256sum -c -
-
-  # Security check step 2: verify via GPG
-  export GNUPGHOME="$(mktemp -d)"
-  gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$JULIA_GPG"
-  gpg --batch --verify julia.tar.gz.asc julia.tar.gz
-  command -v gpgconf > /dev/null && gpgconf --kill all
-  rm -rf "$GNUPGHOME" julia.tar.gz.asc
-
-  # Extract Julia
-  mkdir "$JULIA_PATH"
-  tar -xzf julia.tar.gz -C "$JULIA_PATH" --strip-components 1
-  rm julia.tar.gz
-
-  # Cleanup build dependencies
-  apk del --no-cache .build-deps
-
-%environment
-  export JULIA_PATH=/usr/local/julia
-  export PATH=$JULIA_PATH/bin:$PATH
-
-%test
-  cat << "EOF" > /tmp/singularity-test.sh
-  #!/bin/bash
-  CMDS=('bash' 'ps' 'julia')
-  for CMD in "${CMDS[@]}"; do
-    if ! command -v "$CMD"; then
-      echo "command $CMD not found!"
-      FAILED_TESTS=1
-    fi
-  done
-  # Abort if a test failed
-  if [ -n "$FAILED_TESTS" ]; then
-    exit 1
-  fi
-  EOF
-  chmod +x /tmp/singularity-test.sh
-  bash /tmp/singularity-test.sh
-
-
-%runscript
-  julia "$@"
-
-%labels
-  Author 25492070+MillironX@users.noreply.github.com
-  SoftwareVersion v1.6.2
-  SingularityDefinitionVersion 1
-
-%help
-  Julia
-  =====
-
-  Julia is a high-level dynamic programming language designed to address the
-  needs of high-performance numerical analysis and computational science. It
-  provides a sophisticated compiler, distributed parallel execution, numerical
-  accuracy, and an extensive mathematical function library.
-  Source: GitHub (<https://github.com/topics/julia>)
-
-  For more help, see
-  - <https://julialang.org>
-  - <https://github.com/JuliaLang/julia>
-  - <https://github.com/MillironX/singularity-builds>
diff --git a/minimap_plus/README.md b/minimap_plus/README.md
deleted file mode 100644
index 4c3e25f..0000000
--- a/minimap_plus/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# minimap2 (plus goodies)
-
-[![Container source](https://img.shields.io/static/v1?label=Container%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/MillironX/singularity-builds/tree/master/minimap_plus)
-[![minimap2 source](https://img.shields.io/static/v1?label=minimap2%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/lh3/minimap2)
-[![Version 2.22](https://img.shields.io/static/v1?label=Latest%20version&message=2.22&color=yellowgreen&logo=linuxcontainers&style=flat-square)](https://cloud.sylabs.io/library/millironx/default/minimap_plus)
-[![Docs](https://img.shields.io/static/v1?label=Docs&message=web&color=blue&style=flat-square)](https://lh3.github.io/minimap2/)
-[![Alpine base](https://img.shields.io/static/v1?label=Base%20image&message=Alpine&color=0d597f&logo=alpinelinux&style=flat-square)](https://www.alpinelinux.org/)
-
-Minimap2 is a versatile sequence alignment program that aligns DNA or mRNA sequences against a large reference database.
-
-## Tools installed
-
-### minimap2
-
-- `minimap2`
-
-### samtools
-
-- `samtools`
-
-### Perl
-
-- `perl`
-
-### samclip
-
-- `samclip`
diff --git a/minimap_plus/minimap_plus.def b/minimap_plus/minimap_plus.def
deleted file mode 100644
index 8f81aa1..0000000
--- a/minimap_plus/minimap_plus.def
+++ /dev/null
@@ -1,74 +0,0 @@
-Bootstrap: library
-From: millironx/default/samtools:1.13
-
-%post
-  # Get the actual dependencies
-  apk add --no-cache perl
-
-  # Get the build dependencies
-  apk add --no-cache --virtual .build-deps musl-dev g++ make zlib-dev
-
-  # Part 1: Install minimap2
-  # ========================
-
-  # Make versioning easier
-  MINIMAP2_VERSION='2.22'
-
-  # Download the source tarball and build
-  cd /tmp || exit 1
-  wget https://github.com/lh3/minimap2/releases/download/v$MINIMAP2_VERSION/minimap2-$MINIMAP2_VERSION.tar.bz2
-  tar xjvf minimap2-$MINIMAP2_VERSION.tar.bz2
-  cd minimap2-$MINIMAP2_VERSION || exit 1
-  make
-  install -D -m 0755 minimap2 -t /usr/bin
-  cd .. || exit 1
-  rm -rf minimap2-$MINIMAP2_VERSION*
-  cd || exit 1
-
-  # Part 2: Install samclip
-  SAMCLIP_VERSION='0.4.0'
-  cd /usr/bin || exit 1
-  wget https://raw.githubusercontent.com/tseemann/samclip/v$SAMCLIP_VERSION/samclip
-  chmod a+x samclip
-  cd || exit 1
-
-  # Cleanup build packages
-  apk del --no-cache .build-deps
-
-%test
-  test_command () {
-    if ! command -v "${1}"; then
-      echo "command ${1} not found!"
-      export FAILED_TESTS=1
-    fi
-  }
-
-  test_command bash
-  test_command ps
-  test_command samtools
-  test_command minimap2
-  test_command samclip
-
-  if [ -n "$FAILED_TESTS" ]; then
-    exit 1
-  fi
-
-%runscript
-  minimap2 "$@"
-
-%labels
-  Author 25492070+MillironX@users.noreply.github.com
-  SoftwareVersion 2.22
-  SingularityDefinitionVersion 1
-
-%help
-  minimap2
-  ========
-
-  Minimap2 is a versatile sequence alignment program that aligns DNA or mRNA
-  sequences against a large reference database.
-
-  For more help, see
-  - <https://lh3.github.io/minimap2/>
-  - <https://github.com/lh3/minimap2>
-  - <https://github.com/MillironX/singularity-builds>
diff --git a/pigz/README.md b/pigz/README.md
deleted file mode 100644
index 4eb1908..0000000
--- a/pigz/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# pigz
-
-[![Container source](https://img.shields.io/static/v1?label=Container%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/MillironX/singularity-builds/tree/master/pigz)
-[![pigz source](https://img.shields.io/static/v1?label=pigz%20Source&message=web&color=yellow&logo=linux&style=flat-square)](https://www.zlib.net/pigz/)
-[![Version 2.4-4](https://img.shields.io/static/v1?label=Latest%20version&message=2.4-4&color=yellowgreen&logo=linuxcontainers&style=flat-square)](https://cloud.sylabs.io/library/millironx/default/pigz)
-[![Docs](https://img.shields.io/static/v1?label=Docs&message=man/PDF&color=blue&style=flat-square)](https://www.zlib.net/pigz/pigz.pdf)
-[![CentOS base](https://img.shields.io/static/v1?label=Base%20image&message=CentOS&color=9fcf32&logo=centos&style=flat-square)](https://www.centos.org/)
-
-pigz, which stands for parallel implementation of gzip, is a fully functional
-replacement for gzip that exploits multiple processors and multiple cores to the
-hilt when compressing data.
-
-## Tools installed
-
-### pigz
-
-- `pigz`
diff --git a/pigz/pigz.def b/pigz/pigz.def
deleted file mode 100644
index c8748df..0000000
--- a/pigz/pigz.def
+++ /dev/null
@@ -1,32 +0,0 @@
-Bootstrap: library
-From: default/centos:latest
-
-%post
-    dnf install pigz procps-ng -y
-
-%test
-    if [ ! "$(command -v pigz)" ]; then
-        echo "command julia not found!"
-        FAILED_TESTS="TRUE"
-    fi
-
-    if [ ! "$(command -v bash)" ]; then
-        echo "command bash not found!"
-        FAILED_TESTS="TRUE"
-    fi
-
-    if [ ! "$(command -v ps)" ]; then
-        echo "command ps not found!"
-        FAILED_TESTS="TRUE"
-    fi
-
-    if [ -n "$FAILED_TESTS" ]; then
-        exit 1
-    fi
-
-%runscript
-    pigz "$@"
-
-%labels
-    Author 25492070+MillironX@users.noreply.github.com
-    Version v2.3.1
diff --git a/ray/README.md b/ray/README.md
deleted file mode 100644
index b002001..0000000
--- a/ray/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Ray
-
-[![Container source](https://img.shields.io/static/v1?label=Container%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/MillironX/singularity-builds/tree/master/ray)
-[![Ray source](https://img.shields.io/static/v1?label=Ray%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/sebhtml/ray)
-[![Version v2.4-4](https://img.shields.io/static/v1?label=Latest%20version&message=v2.3.1&color=yellowgreen&logo=linuxcontainers&style=flat-square)](https://cloud.sylabs.io/library/millironx/default/ray)
-[![Docs](https://img.shields.io/static/v1?label=Docs&message=SourceForge&color=blue&style=flat-square)](http://denovoassembler.sourceforge.net/)
-[![Ubuntu base](https://img.shields.io/static/v1?label=Base%20image&message=Ubuntu&color=e95420&logo=ubuntu&style=flat-square)](https://ubuntu.com/)
-
-Ray is a parallel de novo genome assembler that utilises the message-passing
-interface everywhere and is implemented using peer-to-peer communication.
-
-## Tools installed
-
-### Ray
-
-- `mpiexec`
-- `Ray`
diff --git a/ray/ray.def b/ray/ray.def
deleted file mode 100644
index a43cf74..0000000
--- a/ray/ray.def
+++ /dev/null
@@ -1,22 +0,0 @@
-Bootstrap: library
-From: default/ubuntu:20.04
-
-%post
-    apt-get -y update
-    apt-get -y --no-install-recommends install software-properties-common
-    add-apt-repository universe
-    apt-get -y update
-    apt-get -y --no-install-recommends install ray
-
-%test
-    if [ ! "$(command -v Ray)" ]; then
-        echo "command Ray not found!"
-        exit 1
-    fi
-
-%runscript
-    mpiexec --use-hwthread-cpus Ray "$@"
-
-%labels
-    Author 25492070+MillironX@users.noreply.github.com
-    Version v2.3.1
diff --git a/samtools/README.md b/samtools/README.md
deleted file mode 100644
index 5ee7c4e..0000000
--- a/samtools/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Samtools
-
-[![Container source](https://img.shields.io/static/v1?label=Container%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/MillironX/singularity-builds/tree/master/samtools)
-[![VarScan source](https://img.shields.io/static/v1?label=Samtools%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/samtools/samtools)
-[![Version 1.13](https://img.shields.io/static/v1?label=Latest%20version&message=1.13&color=yellowgreen&logo=linuxcontainers&style=flat-square)](https://cloud.sylabs.io/library/millironx/default/samtools)
-[![Docs](https://img.shields.io/static/v1?label=Docs&message=man/web&color=blue&style=flat-square)](https://www.htslib.org/doc/samtools.html)
-[![Alpine base](https://img.shields.io/static/v1?label=Base%20image&message=Alpine&color=0d597f&logo=alpinelinux&style=flat-square)](https://www.alpinelinux.org/)
-
-Samtools is a set of utilities that manipulate alignments in the SAM (Sequence Alignment/Map), BAM, and CRAM formats. It converts between the formats, does sorting, merging and indexing, and can retrieve reads in any regions swiftly.
-
-## Tools installed
-
-### samtools
-
-- `samtools`
diff --git a/samtools/samtools.def b/samtools/samtools.def
deleted file mode 100644
index 0a7bd50..0000000
--- a/samtools/samtools.def
+++ /dev/null
@@ -1,63 +0,0 @@
-Bootstrap: library
-From: default/alpine:3.14.0
-
-%post
-  # Get the actual dependencies
-  apk add --no-cache ncurses libbz2 xz zlib bash
-
-  # Get the build dependencies
-  apk add --no-cache --virtual .build-deps ncurses-dev musl-dev g++ make zlib-dev bzip2-dev xz-dev
-
-  # Make versioning easier
-  SAMTOOLS_VERSION='1.13'
-
-  # Download the source tarball and build
-  cd /tmp || exit 1
-  wget https://github.com/samtools/samtools/releases/download/$SAMTOOLS_VERSION/samtools-$SAMTOOLS_VERSION.tar.bz2
-  tar xjvf samtools-$SAMTOOLS_VERSION.tar.bz2
-  cd samtools-$SAMTOOLS_VERSION || exit 1
-  ./configure
-  make && make install
-  cd .. || exit 1
-  rm -rf samtools-$SAMTOOLS_VERSION*
-  cd || exit 1
-
-  # Cleanup build packages
-  apk del --no-cache .build-deps
-
-%test
-  test_command () {
-    if ! command -v "${1}"; then
-      echo "command ${1} not found!"
-      export FAILED_TESTS=1
-    fi
-  }
-
-  test_command bash
-  test_command ps
-  test_command samtools
-
-  if [ -n "$FAILED_TESTS" ]; then
-    exit 1
-  fi
-
-%runscript
-  samtools "$@"
-
-%labels
-  Author 25492070+MillironX@users.noreply.github.com
-  SoftwareVersion 1.13
-  SingularityDefinitionVersion 1
-
-%help
-  Samtools
-  ========
-
-  Samtools is a set of utilities that manipulate alignments in the SAM
-  (Sequence Alignment/Map), BAM, and CRAM formats. It converts between the
-  formats, does sorting, merging and indexing, and can retrieve reads in any
-  regions swiftly.
-
-  For more help, see
-  - <https://www.htslib.org/doc/samtools.html>
-  - <https://github.com/MillironX/singularity-builds>
diff --git a/shorah/README.md b/shorah/README.md
deleted file mode 100644
index 73a2009..0000000
--- a/shorah/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# ShoRAH
-
-[![Container source](https://img.shields.io/static/v1?label=Container%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/MillironX/singularity-builds/tree/master/shorah)
-[![ShoRAH source](https://img.shields.io/static/v1?label=ShoRAH%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/cbg-ethz/shorah)
-[![Version 1.99.2](https://img.shields.io/static/v1?label=Latest%20version&message=1.99.2&color=yellowgreen&logo=linuxcontainers&style=flat-square)](https://cloud.sylabs.io/library/millironx/default/shorah)
-[![Docs](https://img.shields.io/static/v1?label=Docs&message=web&color=blue&style=flat-square)](https://github.com/cbg-ethz/shorah)
-[![Alpine base](https://img.shields.io/static/v1?label=Base%20image&message=Alpine&color=0d597f&logo=alpinelinux&style=flat-square)](https://www.alpinelinux.org/)
-
-ShoRAH is an open source project for the analysis of next generation sequencing data. It is designed to analyse genetically heterogeneous samples. Its tools are written in different programming languages and provide error correction, haplotype reconstruction and estimation of the frequency of the different genetic variants present in a mixed sample.
-
-## Tools installed
-
-### ShoRAH
-
-- `shorah`
-- `b2w`
-- `diri_sampler`
-- `fil`
diff --git a/shorah/shorah.def b/shorah/shorah.def
deleted file mode 100644
index b0d4310..0000000
--- a/shorah/shorah.def
+++ /dev/null
@@ -1,71 +0,0 @@
-Bootstrap: library
-From: millironx/default/htslib:1.13
-
-%post
-  # Install dependencies
-  apk add --no-cache python3 libcurl
-
-  # Install build dependencies
-  apk add --no-cache --virtual .build-deps py-pip g++ musl-dev make python3-dev boost-dev curl-dev
-
-  # Install python package dependencies
-  pip install --no-cache-dir biopython==1.79 numpy==1.21.2
-
-  # Make versioning easier
-  SHORAH_VERSION=1.99.2
-
-  # Download the source tarball and build
-  cd /tmp || exit 1
-  wget https://github.com/cbg-ethz/shorah/releases/download/v$SHORAH_VERSION/shorah-$SHORAH_VERSION.tar.bz2 -O shorah-$SHORAH_VERSION.tar.bz2
-  tar xjvf shorah-$SHORAH_VERSION.tar.bz2
-  cd shorah-$SHORAH_VERSION
-  ./configure
-  make
-  make install
-  cd .. || exit 1
-  rm -rf shorah-$SHORAH_VERSION*
-  cd || exit 1
-
-  # Cleanup build packages
-  apk del --no-cache .build-deps
-
-%test
-  test_command () {
-    if ! command -v "${1}"; then
-      echo "command ${1} not found!"
-      export FAILED_TESTS=1
-    fi
-  }
-
-  test_command bash
-  test_command ps
-  test_command shorah
-  test_command b2w
-  test_command diri_sampler
-  test_command fil
-
-  if [ -n "$FAILED_TESTS" ]; then
-    exit 1
-  fi
-
-%runscript
-  shorah "$@"
-
-%labels
-  Author 25492070+MillironX@users.noreply.github.com
-  SoftwareVersion 2.0.2
-  SingularityDefinitionVersion 1
-
-%help
-  ShoRAH
-  ======
-
-  ShoRAH is an open source project for the analysis of next generation
-  sequencing data. It is designed to analyse genetically heterogeneous samples.
-  Its tools are written in different programming languages and provide error
-  correction, haplotype reconstruction and estimation of the frequency of the
-  different genetic variants present in a mixed sample.
-
-  For more help, see
-  - <http://cbg-ethz.github.io/shorah>
-  - <https://github.com/MillironX/singularity-builds>
diff --git a/varscan/README.md b/varscan/README.md
deleted file mode 100644
index 165923c..0000000
--- a/varscan/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# VarScan
-
-[![Container source](https://img.shields.io/static/v1?label=Container%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/MillironX/singularity-builds/tree/master/varscan)
-[![VarScan source](https://img.shields.io/static/v1?label=VarScan%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/dkoboldt/varscan)
-[![Version v2.4.4](https://img.shields.io/static/v1?label=Latest%20version&message=v2.4.4&color=yellowgreen&logo=linuxcontainers&style=flat-square)](https://cloud.sylabs.io/library/millironx/default/varscan)
-[![Docs](https://img.shields.io/static/v1?label=Docs&message=gh-pages&color=blue&style=flat-square)](https://dkoboldt.github.io/varscan/)
-[![Alpine base](https://img.shields.io/static/v1?label=Base%20image&message=Alpine&color=0d597f&logo=alpinelinux&style=flat-square)](https://www.alpinelinux.org/)
-
-VarScan is a platform-independent mutation caller for targeted, exome, and whole-genome resequencing data generated on Illumina, SOLiD, Life/PGM, Roche/454, and similar instruments.
-
-## Tools installed
-
-### samtools
-
-- `samtools`
-
-### VarScan
-
-- `varscan`
diff --git a/varscan/varscan.def b/varscan/varscan.def
deleted file mode 100644
index c5fe724..0000000
--- a/varscan/varscan.def
+++ /dev/null
@@ -1,93 +0,0 @@
-Bootstrap: library
-From: default/alpine:3.14.0
-
-%post
-  # Part 1: Install Samtools
-  # ========================
-
-  # Get the actual dependencies
-  apk add --no-cache ncurses libbz2 xz zlib
-
-  # Get the build dependencies
-  apk add --no-cache --virtual .build-deps ncurses-dev musl-dev g++ make zlib-dev bzip2-dev xz-dev
-
-  # Make versioning easier
-  SAMTOOLS_VERSION='1.13'
-
-  # Download the source tarball and build
-  cd /tmp || exit 1
-  wget https://github.com/samtools/samtools/releases/download/$SAMTOOLS_VERSION/samtools-$SAMTOOLS_VERSION.tar.bz2
-  tar xjvf samtools-$SAMTOOLS_VERSION.tar.bz2
-  cd samtools-$SAMTOOLS_VERSION || exit 1
-  ./configure
-  make && make install
-  cd .. || exit 1
-  rm -rf samtools-$SAMTOOLS_VERSION*
-  cd || exit 1
-
-  # Cleanup build packages
-  apk del --no-cache .build-deps
-
-  # Part 2: Install VarScan
-  # ========================
-
-  # Install java
-  apk add --no-cache openjdk8
-
-  # Make versioning easier
-  VARSCAN_VERSION='v2.4.4'
-
-  # Download varscan
-  wget https://github.com/dkoboldt/varscan/raw/master/VarScan.v2.4.4.jar -O /opt/varscan.jar
-
-  # Create a shim for varscan
-  echo "#!/bin/bash" > /usr/local/bin/varscan
-  echo "java -jar /opt/varscan.jar \"\$@\"" >> /usr/local/bin/varscan
-  chmod +x /usr/local/bin/varscan
-
-  # Part 3: Install Nextflow dependencies
-  # =====================================
-  apk add --no-cache bash
-
-%test
-  cat << "EOF" > /tmp/singularity-test.sh
-  #!/bin/bash
-  CMDS=('bash' 'ps' 'java' 'varscan' 'samtools')
-  for CMD in "${CMDS[@]}"; do
-    if ! command -v "$CMD"; then
-      echo "command $CMD not found!"
-      FAILED_TESTS=1
-    fi
-  done
-  # Abort if a test failed
-  if [ -n "$FAILED_TESTS" ]; then
-    exit 1
-  fi
-  EOF
-  chmod +x /tmp/singularity-test.sh
-  bash /tmp/singularity-test.sh
-
-%runscript
-  varscan "$@"
-
-%labels
-  Author 25492070+MillironX@users.noreply.github.com
-  SoftwareVersion v2.4.4
-  SingularityDefinitionVersion 2
-
-%help
-  VarScan
-  =======
-
-  VarScan is a platform-independent mutation caller for targeted, exome, and
-  whole-genome resequencing data generated on Illumina, SOLiD, Life/PGM,
-  Roche/454, and similar instruments. It can be used to detect different types
-  of variation:
-  - Germline variants (SNPs an dindels) in individual samples or pools of samples.
-  - Multi-sample variants (shared or private) in multi-sample datasets (with mpileup).
-  - Somatic mutations, LOH events, and germline variants in tumor-normal pairs.
-  - Somatic copy number alterations (CNAs) in tumor-normal exome data.
-
-  For more help, see
-  - <https://dkoboldt.github.io/varscan/>
-  - <https://github.com/MillironX/singularity-builds>
diff --git a/velvet/README.md b/velvet/README.md
deleted file mode 100644
index d9b54a7..0000000
--- a/velvet/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Velvet
-
-[![Container source](https://img.shields.io/static/v1?label=Container%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](https://github.com/MillironX/singularity-builds/tree/master/velvet)
-[![Velvet source](https://img.shields.io/static/v1?label=Velvet%20Source&message=GitHub&color=lightgrey&logo=github&style=flat-square)](http://github.com/dzerbino/velvet/tree/master)
-[![Version 1.2.10](https://img.shields.io/static/v1?label=Latest%20version&message=1.2.10&color=yellowgreen&logo=linuxcontainers&style=flat-square)](https://cloud.sylabs.io/library/millironx/default/velvet)
-[![Docs](https://img.shields.io/static/v1?label=Docs&message=PDF&color=blue&style=flat-square)](https://www.ebi.ac.uk/~zerbino/velvet/Manual.pdf)
-[![CentOS base](https://img.shields.io/static/v1?label=Base%20image&message=CentOS&color=9fcf32&logo=centos&style=flat-square)](https://www.centos.org/)
-
-Sequence assembler for very short reads
-
-## Tools installed
-
-### Velvet
-
-- `velvetg`
-- `velveth`
diff --git a/velvet/velvet.def b/velvet/velvet.def
deleted file mode 100644
index 5bbb93a..0000000
--- a/velvet/velvet.def
+++ /dev/null
@@ -1,49 +0,0 @@
-Bootstrap: library
-From: default/centos:latest
-
-%post
-  # Quiet perl down
-  export LC_ALL=C
-
-  # Install package files
-  dnf install dnf-plugins-core -y
-  dnf copr enable millironx/velvet -y
-  dnf install velvet-1.2.10 procps -y
-
-  # Clean up
-  dnf remove dnf-plugins-core -y
-  dnf autoremove -y
-  dnf clean all
-
-%environment
-  export LC_ALL=C
-
-%test
-  # We can use bash notation here, since /bin/sh is symlinked to bash in CentOS
-  CMDS=('bash' 'ps' 'velvetg' 'velveth')
-  for CMD in "${CMDS[@]}"; do
-    if ! command -v "$CMD"; then
-      echo "command $CMD not found!"
-      FAILED_TESTS=1
-    fi
-  done
-  # Abort if a test failed
-  if [ -n "$FAILED_TESTS" ]; then
-    exit 1
-  fi
-
-%labels
-  Author 25492070+MillironX@users.noreply.github.com
-  SoftwareVersion 1.2.10
-  SingularityDefinitionVersion 1
-
-%help
-  Velvet
-  ======
-
-  Sequence assembler for very short reads
-
-  For more help, see
-  - <https://www.ebi.ac.uk/~zerbino/velvet/>
-  - <https://github.com/MillironX/velvet-copr>
-  - <https://github.com/MillironX/singularity-builds>