diff --git a/README.md b/README.md
index 9e21f0b7..1590bf48 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ To use TaPaSCo, you'll need working installations of
 *   Vivado Design Suite 2017.4 or newer
 *   Java SDK 8 - 11
 *   git
-*   python
+*   python3
 *   GCC newer than 5.x.x for C++11 support
 *   *OPTIONAL:* Local Installation of gradle 5.0+, if you do not want to use the included wrapper.
 
@@ -112,12 +112,12 @@ Prerequisites for compiling the runtime
 
 *Ubuntu*:
 ```
-apt-get -y install build-essential linux-headers-generic python cmake libelf-dev git rpm
+apt-get -y install build-essential linux-headers-generic python3 cmake libelf-dev git rpm
 ```
 
 *Fedora*:
 ```
-dnf -y install kernel-devel make gcc gcc-c++ elfutils-libelf-devel cmake python libatomic git rpm-build
+dnf -y install kernel-devel make gcc gcc-c++ elfutils-libelf-devel cmake python3 libatomic git rpm-build
 ```
 
 *Rust*:
diff --git a/tapasco-init.sh b/tapasco-init.sh
index a4b10a1b..7fca0e9b 100755
--- a/tapasco-init.sh
+++ b/tapasco-init.sh
@@ -44,12 +44,12 @@ else
 
     echo "if echo \"\${PATH}\" | grep --quiet \"cmake-3.3.2\";" >> tapasco-setup.sh
     echo "then" >> tapasco-setup.sh
-    echo "    if ! command -v python > /dev/null;" >> tapasco-setup.sh
+    echo "    if ! command -v python3 > /dev/null;" >> tapasco-setup.sh
     echo "    then" >> tapasco-setup.sh
-    echo "        echo \"Could not remove old CMake version from Path. Please install python\"" >> tapasco-setup.sh
+    echo "        echo \"Could not remove old CMake version from Path. Please install python3\"" >> tapasco-setup.sh
     echo "    else" >> tapasco-setup.sh
     echo "        echo \"Removing old CMake version 3.3.2 distributed with Vivado from Path\"" >> tapasco-setup.sh
-    echo "        export PATH=\`python -c \"import re; print(re.sub(r'[:][^:]*?cmake[-]3[.]3[.]2.*?[:]', ':', '\${PATH}'));\"\`" >> tapasco-setup.sh
+    echo "        export PATH=\`python3 -c \"import re; print(re.sub(r'[:][^:]*?cmake[-]3[.]3[.]2.*?[:]', ':', '\${PATH}'));\"\`" >> tapasco-setup.sh
     echo "    fi" >> tapasco-setup.sh
     echo "fi" >> tapasco-setup.sh
 
diff --git a/toolflow/vivado/platform/zynqmp/buildLibs.py b/toolflow/vivado/platform/zynqmp/buildLibs.py
deleted file mode 100755
index 7f029582..00000000
--- a/toolflow/vivado/platform/zynqmp/buildLibs.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/python
-import sys
-import subprocess
-
-clean = len(sys.argv) > 1 and sys.argv[1] == "clean"
-debug = len(sys.argv) > 1 and (sys.argv[1] == "debug" or sys.argv[1] == "driver_debug")
-driver_debug = len(sys.argv) > 1 and sys.argv[1] == "driver_debug"
-
-moddir = "$TAPASCO_HOME/platform/zynq/module"
-pdir = "$TAPASCO_HOME/platform/zynq/build"
-adir = "$TAPASCO_HOME/arch/axi4mm/build"
-
-if clean:
-	subprocess.call(["rm -rf " + pdir], shell=True)
-	subprocess.call(["rm -rf " + adir], shell=True)
-	subprocess.call(["cd " + moddir + " && make clean"], shell=True)
-else:
-	if debug:
-	    print("Building debug mode libraries...")
-	else:
-	    print("Building release mode libraries, pass 'debug' as first argument to build debug libs...")
-	
-	subprocess.call(["cd " + moddir + " && make " + ("" if driver_debug else "release ")], shell=True)
-	subprocess.call(["mkdir -p " + pdir + " && cd " + pdir + " && cmake " + ("" if debug else "-DCMAKE_BUILD_TYPE=Release") + " .. && make && make install"], shell=True)
-	subprocess.call(["mkdir -p " + adir + " && cd " + adir + " && cmake " + ("" if debug else "-DCMAKE_BUILD_TYPE=Release") + " .. && make && make install"], shell=True)
diff --git a/toolflow/vivado/platform/zynqmp/interrupts.dtsi b/toolflow/vivado/platform/zynqmp/interrupts.dtsi
deleted file mode 100644
index b2383442..00000000
--- a/toolflow/vivado/platform/zynqmp/interrupts.dtsi
+++ /dev/null
@@ -1,7 +0,0 @@
-&amba {
-    f2p_irq@0 {
-        compatible = "none";
-        interrupt-parent = <&gic>;
-        interrupts = <0 89 4>, <0 90 4>, <0 91 4>, <0 92 4>;
-    };
-};
\ No newline at end of file