diff --git a/apps/Raspi2png/install b/apps/Raspi2png/install
index 44b72dd..62bae9d 100755
--- a/apps/Raspi2png/install
+++ b/apps/Raspi2png/install
@@ -6,14 +6,16 @@ function error {
   echo -e "\\e[91m$1\\e[39m"
   exit 1
 }
+
 "${DIRECTORY}/pkg-install" "libpng-dev" "$(dirname "$0")" || exit 1
 
+rm -rf ~/raspi2png
 git clone https://github.com/AndrewFromMelbourne/raspi2png || error "failed to clone repository!"
 
-cd raspi2png || error "failed to enter directory!"
+cd ~/raspi2png || error "failed to enter directory!"
 
 make || error "failed to compile!"
 sudo make install || error "sudo make install failed!"
 
-cd ..
-rm -rf raspi2png || error "failed to delete directory!"
+cd ~/
+rm -rf ~/raspi2png || error "failed to delete directory!"
diff --git a/apps/Raspi2png/installed-packages b/apps/Raspi2png/installed-packages
deleted file mode 100644
index a94e783..0000000
--- a/apps/Raspi2png/installed-packages
+++ /dev/null
@@ -1,3 +0,0 @@
-libpng12-dev
-libpng12-dev
-
diff --git a/apps/Raspi2png/uninstall b/apps/Raspi2png/uninstall
index a94faea..32bf9c9 100755
--- a/apps/Raspi2png/uninstall
+++ b/apps/Raspi2png/uninstall
@@ -7,4 +7,4 @@ function error {
   exit 1
 }
 
-sudo rm /usr/bin/raspi2png
+sudo rm -f /usr/bin/raspi2png