diff --git a/barbora.csv b/barbora.csv
index bbcbb8b4bf2412a0f60f867c8f59ac7361ef0408..7aba77493272811eda15ad7d689b1ab35a84fcba 100644
--- a/barbora.csv
+++ b/barbora.csv
@@ -438,7 +438,6 @@ iimpi/2018a,32
 iimpi/2019a,32
 iimpi/2020a,32
 iimpi/2020b,32
-iimpi/2021a,32
 ImageMagick/7.0.10-1-GCCcore-9.3.0,32
 ImageMagick/7.0.10-6-GCCcore-8.3.0,32
 imkl/2017.4.239-iimpi-2017c,32
@@ -448,7 +447,6 @@ imkl/2019.5.281-iimpi-2019a,32
 imkl/2020.0.166-iimpi-2020a,32
 imkl/2020.1.217-iimpi-2020a,32
 imkl/2020.4.304-iimpi-2020b,32
-imkl/2021.2.0-iimpi-2021a,32
 impi/2017.4.239-iccifort-2017.8.262-GCC-6.3.0-2.27,32
 impi/2018.4.274-iccifort-2018.5.274-GCC-8.3.0-2.32,32
 impi/2018.4.274-iccifort-2019.1.144-GCC-8.2.0-2.31.1,32
@@ -457,16 +455,13 @@ impi/2019.6.154-iccifort-2019.5.281-GCC-8.3.0-2.32,32
 impi/2019.6.166-iccifort-2020.0.166,32
 impi/2019.7.217-iccifort-2020.1.217,32
 impi/2019.9.304-iccifort-2020.4.304,32
-impi/2021.2.0-intel-compilers-2021.2.0,32
 Inspector/2019_update4,32
 intel/2017c,32
 intel/2018a,32
 intel/2019a,32
 intel/2020a,32
 intel/2020b,32
-intel/2021a,32
 intel-compilers/2021.1.2,32
-intel-compilers/2021.2.0,32
 intelcuda/2020a,32
 intltool/0.51.0,32
 intltool/0.51.0-GCCcore-10.2.0,32
diff --git a/barbora.md b/barbora.md
index 56b948ac4a9c94304ff5c0556d6c69f85e24212e..ecc3a40f7b39a0dfc79d50a97aaae2e9ebe3815d 100644
--- a/barbora.md
+++ b/barbora.md
@@ -362,7 +362,7 @@
 | gompi | GNU Compiler Collection (GCC) based local_compiler toolchain, including OpenMPI for MPI support. |
 | gompic | GNU Compiler Collection (GCC) based compiler toolchain along with CUDA toolkit, including OpenMPI for MPI support with CUDA features enabled. |
 | [iccifort](http://software.intel.com/en-us/intel-cluster-toolkit-local_compiler/) | Intel C, C++ & Fortran compilers |
-| [iimpi](https://software.intel.com/parallel-studio-xe) | Intel C/C++ and Fortran compilers, alongside Intel MPI. |
+| [iimpi](http://software.intel.com/en-us/intel-cluster-toolkit-compiler/) | Intel C/C++ and Fortran compilers, alongside Intel MPI. |
 | [intel](https://easybuild.readthedocs.io/en/master/Common-toolchains.html#intel-toolchain) | Compiler toolchain including Intel compilers, Intel MPI and Intel Math Kernel Library (MKL). |
 | intelcuda | Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and Fortran compilers, Intel MPI & Intel MKL, with CUDA toolkit |
 | [Py](https://www.python.org) | Python 3.6 toolchain |