diff --git a/.actrc b/.actrc
deleted file mode 100644
index a999e8bab..000000000
--- a/.actrc
+++ /dev/null
@@ -1,4 +0,0 @@
--P ubuntu-latest=catthehacker/ubuntu:act-latest
--P ubuntu-20.04=catthehacker/ubuntu:act-20.04
--P ubuntu-18.04=catthehacker/ubuntu:act-18.04
-ubuntu-16.04=catthehacker/ubuntu:act-16.04
\ No newline at end of file
diff --git a/.env b/.env
deleted file mode 100644
index 6eeaed5c7..000000000
--- a/.env
+++ /dev/null
@@ -1 +0,0 @@
-MainsailOS
\ No newline at end of file
diff --git a/run.sh b/run.sh
index b53c9816f..bd385bb87 100755
--- a/run.sh
+++ b/run.sh
@@ -1,22 +1,16 @@
 #!/bin/bash
 
 #####  run.sh - test new image
-<<COMMENT
-    Original by "prg3" ( https://github.com/prg3 ) and "Noms" ( https://github.com/Nomsplease )
-
-    Modified by "KwadFan" ( https://github.com/KwadFan )
-
-COMMENT
+#  Original by "prg3" ( https://github.com/prg3 ) and "Noms" ( https://github.com/Nomsplease )
+#  Modified by Stephan Wendel aka KwadFan <me@stephanwe.de>
 
 ### Configuration
 WORKSPACE=src/workspace
 IMG_FILE=               #if blank, will be detected
 
-
 ## QEMU Parameters
 #
 # for Kernel Version 4.19.50-buster use
-# QEMU_KERNEL='emulation/kernel-qemu-4.19.50-buster'
 # QEMU_DTB='emulation/versatile-pb.dtb'
 #
 # you have also to modify run_image() function!
@@ -30,9 +24,7 @@ QEMU_DTB='emulation/versatile-pb-buster-5.4.51.dtb'
 QEMU_OPTIONS='-no-reboot -nographic'
 QEMU_NET='-net user,ipv4=on,ipv6=on,hostfwd=tcp::22222-:22,hostfwd=tcp::8888-:80 -net nic'
 
-
 ### Functions
-
 ## Hint
 start_hint() {
     echo -e "\e[1;30m\n------------------------------------\e[0m"
@@ -44,7 +36,7 @@ start_hint() {
 search_for_qemu() {
     for BIN_PATH in $(awk -F':' '{ for(i=1;i<=NF;i++) print $i}' <<< ${PATH})
         do
-            [[ -x $BIN_PATH/$QEMU_BIN ]] && { QEMU_CMD=$BIN_PATH/$QEMU_BIN ; break; } 
+            [[ -x $BIN_PATH/$QEMU_BIN ]] && { QEMU_CMD=$BIN_PATH/$QEMU_BIN ; break; }
         done
 }
 
@@ -63,14 +55,14 @@ check_env() {
         then
             echo -e "\n\e[1;32m${QEMU_KERNEL}\e[0m missing, exiting..."
             exit 2
-        else 
+        else
             echo -e "\n\e[1;32m${QEMU_KERNEL}\e[0m found..."
     fi
     if [ ! -e $QEMU_DTB ];
         then
             echo -e "\n\e[1;32m${QEMU_DTB}\e[0m missing, exiting..."
             exit 2
-        else                         
+        else
             echo -e "\n\e[1;32m${QEMU_DTB}\e[0m found..."
     fi
 }
@@ -98,7 +90,7 @@ img_file_handling() {
     fi
 }
 
-## run image 
+## run image
 run_img() {
   qemu-system-arm -cpu $QEMU_CPU -m $QEMU_RAM \
   -kernel $QEMU_KERNEL -M $QEMU_MACHINE -dtb \
@@ -108,16 +100,6 @@ run_img() {
   -device "virtio-blk-pci,drive=disk0,disable-modern=on,disable-legacy=off"
 }
 
-## run image for Kernel Version 4.19.50-buster
-#run_img() {
-#  qemu-system-arm -cpu $QEMU_CPU -m $QEMU_RAM \
-#  -kernel $QEMU_KERNEL -M $QEMU_MACHINE -dtb \
-#  $QEMU_DTB $QEMU_OPTIONS \
-#  -append 'dwc_otg.lpm_enable=0 root=/dev/sda2 rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait' \
-#  -drive file=$WORKSPACE/$IMG_FILE,index=0,media=disk,format=raw $QEMU_NET \ 
-#}
-
-
 ### Main
 start_hint
 search_for_qemu
diff --git a/src/vagrant/Vagrantfile b/src/vagrant/Vagrantfile
deleted file mode 100644
index 448444169..000000000
--- a/src/vagrant/Vagrantfile
+++ /dev/null
@@ -1,16 +0,0 @@
-vagrant_root = File.dirname(__FILE__)
-Vagrant.configure("2") do |o|
-    o.vm.box = "debian/buster64"
-    o.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
-    o.vm.synced_folder File.read("../custompios_path").gsub("\n",""), "/CustomPiOS", create:true, type: "nfs"
-    o.vm.synced_folder "../", "/distro", create:true, type: "nfs"
-    o.vm.network :private_network, ip: "192.168.55.55"
-    o.vm.provision :shell, :path => "setup.sh", args: ENV['SHELL_ARGS']
-
-    #o.vbguest.auto_update = false
-
-    o.vm.provider "virtualbox" do |v|
-        v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
-        v.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
-    end
-end
diff --git a/src/vagrant/run_vagrant_build.sh b/src/vagrant/run_vagrant_build.sh
deleted file mode 100755
index 1ef3189bd..000000000
--- a/src/vagrant/run_vagrant_build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-sudo vagrant ssh -- -t "sudo /CustomPiOS/nightly_build_scripts/custompios_nightly_build $@"
-
diff --git a/src/vagrant/setup.sh b/src/vagrant/setup.sh
deleted file mode 100644
index 36467ff62..000000000
--- a/src/vagrant/setup.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-sudo apt-get update
-sudo apt-get install -y gawk util-linux git qemu-user-static p7zip-full unzip zip
-