diff --git a/bash/image_setup.sh b/bash/image.sh
similarity index 92%
rename from bash/image_setup.sh
rename to bash/image.sh
index e8e4492..4a6a13b 100644
--- a/bash/image_setup.sh
+++ b/bash/image.sh
@@ -98,28 +98,13 @@ if [[ ! $ADDTERRAINRINGS =~ ^[Nn]$ ]]; then
     sudo wget -O /usr/share/dump1090-mutability/html/upintheair.json "http://www.heywhatsthat.com/api/upintheair.json?id=${HEYWHATSTHATVIEWID}&refraction=0.25&alts=$HEYWHATSTHATRINGONE,$HEYWHATSTHATRINGTWO"
 fi
 
-# Pair PiAware with the users account.
+# Restart dump1090-mutability.
 
-echo -e "\033[33m"
-echo "Configure PiAware with your FlightAware account."
-echo "To do so enter the login name and password for your FlightAware account."
-echo "This information will only be used by PiAware to associate it to your account."
-echo -e "\033[37m"
-read -p "FlightAware Login: " PIAWAREUSER
-
-# Restart both dump1090-mutability and PiAware.
-
-sudo piaware-config -user $PIAWAREUSER -password
 echo -e "\033[33m"
 echo "Restarting dump1090-mutability..."
 echo -e "\033[37m"
 sudo /etc/init.d/dump1090-mutability restart
 
-echo -e "\033[33m"
-echo "Restarting PiAware..."
-echo -e "\033[37m"
-sudo /etc/init.d/piaware restart
-
 # Remove the "image" file now that setup has been ran.
 
 rm -f image
diff --git a/install.sh b/install.sh
index a3ed695..1c8b736 100755
--- a/install.sh
+++ b/install.sh
@@ -47,8 +47,8 @@ source $BASHDIR/functions.sh
 
 if [ -f $BASEDIR/image ]; then
     # Execute image setup script.
-    chmod +x $BASHDIR/image_setup.sh
-    $BASHDIR/image_setup.sh
+    chmod +x $BASHDIR/image.sh
+    $BASHDIR/image.sh
 
     # Exit scripts once the the image setup script has completed.
     echo -e "\033[32m"