diff --git a/dist-setup.sh b/dist-setup.sh
deleted file mode 100644
index 0ff8055..0000000
--- a/dist-setup.sh
+++ /dev/null
@@ -1,227 +0,0 @@
-#!/bin/bash
-# vm-setup.sh
-#  
-# This script installs ONOS dependencies and installs a desktop environment on a Mininet VM.
-
-
-export CURRENT_USER=distributed
-export USER_HOME=/home/${CURRENT_USER}
-
-IDEA_URL=http://download.jetbrains.com/idea/ideaIC-14.0.2.tar.gz
-
-# -------------- Setup keys -------------------
-
-mkdir -p ~/.ssh
-ssh-keygen -t rsa -P "" -f .ssh/id_rsa  
-cp .ssh/id_rsa.pub .ssh/authorized_keys
-
-# -------------- Install Karaf ----------------
-
-mkdir Applications
-cd Applications
-wget http://apache.osuosl.org/karaf/3.0.2/apache-karaf-3.0.2.zip
-unzip apache-karaf-3.0.2.zip
-cd -
-
-mkdir Downloads
-cp Applications/apache-karaf-3.0.2.zip Downloads/
-
-#--------------- Setup Docker env ------------
-
-mkdir -p docker/onos-tutorial
-cd docker/onos-tutorial
-cat > Dockerfile << EOF
-FROM ubuntu-upstart:14.10
-MAINTAINER Ali Al-Shabibi <ali@onlab.us>
-RUN apt-get update && apt-get install -y openjdk-8-jre openssh-server
-RUN mkdir /var/run/sshd
-RUN echo 'root:onosrocks' | chpasswd
-RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-# SSH login fix. Otherwise user is kicked off after login
-RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
-ENV NOTVISIBLE "in users profile"
-RUN echo "export VISIBLE=now" >> /etc/profile
-EXPOSE 22 6633 8181
-CMD ["/sbin/init"]
-EOF
-
-sudo docker build -t onos/tutorial-dist .
-
-cd -
-
-# -------------- Download ONOS ----------------
-
-git clone https://github.com/bocon13/onos-byon.git
-git clone https://gerrit.onosproject.org/onos
-cd onos
-git checkout 1.0.0
-git config --global user.email "tutorial@localhost"
-git config --global user.name "Mr. Tutorial"
-git fetch https://gerrit.onosproject.org/onos refs/changes/07/2107/1 && git cherry-pick FETCH_HEAD
-cd -
-
-echo "export JAVA_HOME=''"
-echo ". ~/onos/tools/dev/bash_profile" >> ~/.bashrc
-echo "export ONOS_USER=root" >> ~/.bashrc
-
-sed -i -e 's/open/xdg-open/' ~/onos/tools/test/bin/onos-gui
-
-cat > onos/tools/test/cells/docker << EOF
-export ONOS_NIC="172.17.0.*"
-export OC1="\$(sudo docker inspect --format '{{ .NetworkSettings.IPAddress }}' onos-1)"
-export OC2="\$(sudo docker inspect --format '{{ .NetworkSettings.IPAddress }}' onos-2)"
-export OC3="\$(sudo docker inspect --format '{{ .NetworkSettings.IPAddress }}' onos-3)"
-export OCN="localhost"
-export OCI="\${OC1}"
-export ONOS_FEATURES="webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-proxyarp,onos-app-mobility"
-EOF
-
-echo "unset JAVA_HOME" >> ~/.bashrc
-echo "sudo service onos stop > /dev/null 2>&1" >> ~/.bashrc
-echo "cell docker > /dev/null 2>&1" >> ~/.bashrc
-
-sed -i -e s/sdn/root/ onos/tools/package/debian/onos.conf
-
-cd onos && mvn clean install && cd -
-
-#--------------- set up mininet script --------
-
-cat > ~/startmn.sh << EOF
-#!/bin/bash
-sudo python ~/onos/tools/test/topos/sol.py \$OC1 \$OC2 \$OC3
-EOF
-
-chmod +x ~/startmn.sh
-
-# -------------- Setup Wireshark dissector ----
-
-wget -O openflow.lua "https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=openflow.lua"
-mkdir -p .wireshark/plugins
-mv openflow.lua .wireshark/plugins
-
-
-
-# -------------- Setup Desktop ----------------
-
-sudo apt-get install -y xorg lxde
-
-#TODO: add backgrounds folder
-sudo mkdir -p /usr/share/backgrounds
-#TODO: change background
-# Remove wallpaper, change background color
-sudo sed -i 's/wallpaper_mode=1/wallpaper_mode=0/g' /usr/share/lxde/pcmanfm/LXDE.conf
-sudo sed -i 's/desktop_bg=#000000/desktop_bg=#104187/g' /usr/share/lxde/pcmanfm/LXDE.conf
-
-sudo sed -i 's/lang=1/lang=0/g' /etc/lxdm/default.conf
-sudo sed -i 's/bottom_pane=1/bottom_pane=0/g' /etc/lxdm/default.conf
-sudo sed -i 's/disable=0/disable=1/g' /etc/lxdm/default.conf
-
-
-wget -O onos.png "https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=onos.png"
-sudo cp onos.png /usr/share/backgrounds/default.png
-
-# Automatically start LXDE on login
-echo '[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx' >> ~/.bashrc
-
-# Automatically log into the VM
-#sudo sed -i 's/exec /sbin/getty -8 38400 tty1//g' /etc/init/tty1.conf
-#sudo sed -i '$ d' /etc/init/tty1.conf
-#echo 'exec /bin/login -f bob < /dev/tty1 > /dev/tty1 2>&1' | sudo tee -a /etc/init/tty1.conf
-
-# Disable screensaver
-sudo sed -i '/screensaver/d' /etc/xdg/lxsession/LXDE/autostart
-cat > ${USER_HOME}/.xsessionrc << EOF
-# disable screensaver
-xset s off
-# disable dpms (standby)
-xset -dpms
-EOF
-
-# Change LXTerminal default colors
-#sudo sed -i 's/bgcolor=#000000000000/bgcolor=#ffffffffffff/g' ${USER_HOME}/.config/lxterminal/lxterminal.conf
-#sudo sed -i 's/fgcolor=#aaaaaaaaaaaa/fgcolor=#000000000000/g' ${USER_HOME}/.config/lxterminal/lxterminal.conf
-sudo sed -i 's/bgcolor=#000000000000/bgcolor=#ffffffffffff/g' /usr/share/lxterminal/lxterminal.conf
-sudo sed -i 's/fgcolor=#aaaaaaaaaaaa/fgcolor=#000000000000/g' /usr/share/lxterminal/lxterminal.conf
-
-DESKTOP=${USER_HOME}/Desktop
-
-mkdir -p ${DESKTOP}
-
-cat > ${DESKTOP}/IntelliJ << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=IntelliJ
-Name[en_US]=IntelliJ
-Icon=/home/distributed/Applications/idea/bin/idea.png
-Exec=/home/distributed/Applications/idea/bin/idea.sh
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/Tutorial << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=ONOS Tutorial
-Name[en_US]=ONOS Tutorial
-Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser https://wiki.onosproject.org/display/ONOS/Distributed+ONOS+Tutorial
-Comment[en_US]=
-EOF
-
-
-cat > ${DESKTOP}/Wireshark << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Wireshark
-Name[en_US]=Wireshark
-Icon=wireshark
-Exec=/usr/bin/wireshark
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/Terminal << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Name=LXTerminal
-TryExec=lxterminal
-Exec=lxterminal
-Icon=lxterminal
-Type=Application
-Categories=GTK;Utility;TerminalEmulator;
-EOF
-
-# ------------- Install Other Tools ------------- 
-sudo apt-get install -y wireshark
-# Enable root-less wireshark and add mininet
-echo "Enabling wireshark group"
-echo "wireshark-common wireshark-common/install-setuid boolean true" | sudo debconf-set-selections 
-sudo dpkg-reconfigure -f noninteractive wireshark-common
-sudo usermod -a -G wireshark mininet
-sudo usermod -a -G wireshark tutorial1
-
-
-echo "Installing VirtualBox Guest Additions"
-sudo apt-get install -y virtualbox-guest-x11
-
-sudo apt-get install -y git-review
-
-cd ~/Applications
-
-wget -c -N -O /tmp/idea.tar.gz ${IDEA_URL}
-tar xzf /tmp/idea.tar.gz 
-sudo mv idea-IC-139.659.2 idea
-
-cd -
-
-sudo apt-get clean
-
-# ------------- Zero Unused Blocks -------------
-#TODO investigate zerofree
-echo "Zeroing unused blocks"
-sync
-dd if=/dev/zero of=tmp-zeros
-sync
-rm tmp-zeros
-sync
diff --git a/onos-setup.sh b/onos-setup.sh
deleted file mode 100644
index 69c26ea..0000000
--- a/onos-setup.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-# vm-setup.sh
-#  
-# This script installs ONOS dependencies and installs a desktop environment on a Mininet VM.
-
-
-USER=tutorial1
-USER_HOME=/home/${USER}
-
-export ONOS_USER=$USER
-
-export ONOS_ROOT=~/onos
-export KARAF_ROOT=/opt/onos/apache-karaf-3.0.2
-source $ONOS_ROOT/tools/dev/bash_profile
-sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java  
-sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac
-java -version
-javac -version
-echo $JAVA_HOME
-export JAVA_HOME=""
-cd $ONOS_ROOT && mvn clean install && mvn dependency:go-offline && cd -
-
-sed -i -e s/sdn/$USER/ onos/tools/package/debian/onos.conf
-
-cat << EOF >> onos/tools/test/cells/tutorial
-export ONOS_NIC=127.0.0.*
-export OC1="127.0.0.1" 
-export OCI="${OC1}"
-export ONOS_FEATURES="webconsole,onos-rest,onos-api,onos-core-trivial,onos-cli,onos-openflow"
-export ONOS_USER="tutorial1" 
-EOF
-
-cell tutorial
-
-onos-package
-onos-install -f $OC1
-onos-wait-for-start $OC1
-onos $OC1 "feature:install onos-app-fwd"
-onos $OC1 "feature:install onos-app-ifwd"
-onos $OC1 "feature:install onos-app-sdnip"
-
-# Sleep a little to let the features load up
-sleep 20
-
-sudo echo 'export ONOS_OPTS="clean debug"' > /opt/onos/options
-
-sudo su -c 'echo GRUB_CMDLINE_LINUX_DEFAULT=\"quiet splash\" >> /etc/default/grub'
-sudo su -c update-grub
-
-#--------------- Copy SDNIP code to home -----
-
-sudo -u sdnip cp -r /home/tutorial1/onos/tools/tutorials/sdnip /home/sdnip/
-sudo -u sdnip cp -r /home/sdnip/sdnip/configs /home/sdnip/
-
-# -------------- Copy SDN-IP config ----------
-
-sudo -u tutorial1 cp /home/sdnip/configs/addresses.json /opt/onos/config/
-sudo -u tutorial1 cp /home/sdnip/configs/sdnip.json /opt/onos/config/
diff --git a/opt-setup.sh b/opt-setup.sh
deleted file mode 100644
index 7c64126..0000000
--- a/opt-setup.sh
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/bin/bash
-# vm-setup.sh
-#
-# This script installs ONOS dependencies for packet/optical use case.
-
-
-export CURRENT_USER=optical
-export USER_HOME=/home/${CURRENT_USER}
-
-# -------------- Setup keys -------------------
-
-mkdir -p ~/.ssh
-ssh-keygen -t dsa -P "" -f .ssh/id_dsa
-cp .ssh/id_dsa.pub .ssh/authorized_keys
-
-# -------------- Setup Desktop ---------------
-
-DESKTOP=${USER_HOME}/Desktop
-
-mkdir -p ${DESKTOP}
-
-cat > ${DESKTOP}/ONOS << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=ONOS
-Name[en_US]=ONOS
-Icon=konsole
-Exec=/usr/bin/lxterminal -t 'ONOS' -e 'Applications/apache-karaf-3.0.2/bin/karaf clean'
-Comment[en_US]=
-EOF
-
-cat > "${DESKTOP}/Mininet Small" << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Mininet Small
-Name[en_US]=Mininet Small
-Icon=konsole
-Exec=/usr/bin/lxterminal -t 'Mininet Small Topology' -e 'sudo -E python onos/tools/test/topos/opticalTest.py'
-Comment[en_US]=
-EOF
-
-cat > "${DESKTOP}/Mininet Large" << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Mininet Large
-Name[en_US]=Mininet Large
-Icon=konsole
-Exec=/usr/bin/lxterminal -t 'Mininet Large Topology' -e 'sudo -E python onos/tools/test/topos/opticalTestBig.py'
-Comment[en_US]=
-EOF
-
-cat > "${DESKTOP}/LINC-OE" << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=LINC-OE
-Name[en_US]=LINC-OE
-Icon=konsole
-Exec=/usr/bin/lxterminal -t 'LINC-OE' -e 'sudo linc-oe/rel/linc/bin/linc attach'
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/Tutorial << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Tutorial
-Name[en_US]=Tutorial
-Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser https://wiki.onosproject.org/display/ONOS/Packet+Optical+Tutorial
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/GUI << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=ONOS GUI
-Name[en_US]=ONOS GUI
-Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser http://localhost:8181/onos/ui/index.html#topo
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/Wireshark << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Wireshark
-Name[en_US]=Wireshark
-Icon=wireshark
-Exec=/usr/bin/wireshark
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/Reset << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Reset
-Name[en_US]=Reset
-Icon=konsole
-Exec=/usr/bin/lxterminal -t 'Resetting; please wait' -e 'sudo mn -c'
-Comment[en_US]=
-EOF
-
-# -------------- Setup LINC & dependencies ---------------
-git clone https://github.com/FlowForwarding/LINC-config-generator.git
-cd ~/LINC-config-generator
-git checkout oe-0.4
-make
-cd
-
-git clone https://github.com/FlowForwarding/LINC-Switch.git linc-oe
-cd linc-oe
-sed -i s/3000/300000/ rel/files/vm.args
-cp rel/files/sys.config.orig rel/files/sys.config
-make rel
-cd
-
-# -------------- Setup and install Apache Karaf ---------------
-mkdir -p Applications
-mkdir -p Downloads
-cd Downloads
-wget http://download.nextag.com/apache/karaf/3.0.2/apache-karaf-3.0.2.tar.gz
-tar -zxvf apache-karaf-3.0.2.tar.gz -C ../Applications/
-cd
-sed -i s/features$/features,mvn:org.onosproject\\/onos-features\\/1.0.1-SNAPSHOT\\/xml\\/features/ ~/Applications/apache-karaf-3.0.2/etc/org.apache.karaf.features.cfg
-sed -i s/management$/management,webconsole,onos-rest,onos-api,onos-core-trivial,onos-cli,onos-openflow,onos-gui,onos-app-optical,onos-app-proxyarp/ ~/Applications/apache-karaf-3.0.2/etc/org.apache.karaf.features.cfg
-
-# -------------- Setup and install ONOS ---------------
-git clone https://gerrit.onosproject.org/onos -b onos-1.0
-
-export ONOS_USER=$CURRENT_USER
-
-export ONOS_ROOT=~/onos
-export KARAF_ROOT=~/Applications/apache-karaf-3.0.2
-source onos/tools/dev/bash_profile
-unset $JAVA_HOME
-cd onos && mvn clean install && mvn dependency:go-offline && cd -
-
-cp onos/tools/package/branding/target/onos-branding-1.0.1-SNAPSHOT.jar Applications/apache-karaf-3.0.2/lib/
-
-# Configure cell
-cat << EOF >> onos/tools/test/cells/optical
-export ONOS_NIC=127.0.0.*
-export OC1="127.0.0.1"
-export OCI="${OC1}"
-export ONOS_FEATURES="webconsole,onos-rest,onos-api,onos-core-trivial,onos-cli,onos-openflow,onos-gui,onos-app-optical,onos-app-proxyarp"
-export ONOS_USER="optical"
-EOF
-
-# Setup profile
-echo "source $ONOS_ROOT/tools/dev/bash_profile" >> ~/.profile
-echo "unset JAVA_HOME" >> ~/.profile
-echo "sudo service onos stop > /dev/null 2>&1" >> ~/.profile
-echo "cell optical > /dev/null 2>&1" >> ~/.profile
-
-# Allow user full access to wireshark
-sudo usermod -a -G wireshark optical
diff --git a/sdnip-setup.sh b/sdnip-setup.sh
deleted file mode 100644
index 3afcb00..0000000
--- a/sdnip-setup.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-# vm-setup.sh
-#  
-# This script installs ONOS dependencies and installs a desktop environment on a Miniet VM.
-
-
-export CURRENT_USER=sdnip
-export USER_HOME=/home/${CURRENT_USER}
-
-# -------------- Setup keys -------------------
-
-mkdir -p ~/.ssh
-ssh-keygen -t dsa -P "" -f .ssh/id_dsa  
-cp .ssh/id_dsa.pub .ssh/authorized_keys
-
-# -------------- Setup Desktop ---------------
-
-DESKTOP=${USER_HOME}/Desktop
-
-mkdir -p ${DESKTOP}
-
-cat > ${DESKTOP}/ONOS << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=ONOS
-Name[en_US]=ONOS
-Icon=konsole
-Exec=/usr/bin/lxterminal -e '/opt/onos/apache-karaf-3.0.2/bin/client -u karaf'
-Comment[en_US]=
-EOF
-
-cat > "${DESKTOP}/SDN-IP Mininet" << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=SDN-IP Mininet
-Name[en_US]=SDN-IP Mininet
-Icon=konsole
-Exec=/usr/bin/lxterminal -e 'sudo mn --custom /home/sdnip/sdnip/tutorial.py --topo sdnip --controller remote --nolistenport'
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/Tutorial << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=SDN-IP Tutorial
-Name[en_US]=SDN-IP Tutorial
-Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser https://wiki.onosproject.org/display/ONOS/SDN-IP+Tutorial
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/GUI << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=ONOS GUI
-Name[en_US]=ONOS GUI
-Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser http://localhost:8181/onos/ui/index.html#topo
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/Wireshark << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Wireshark
-Name[en_US]=Wireshark
-Icon=wireshark
-Exec=/usr/bin/wireshark
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/Reset << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Reset
-Name[en_US]=Reset
-Icon=konsole
-Exec=/usr/bin/lxterminal -t 'Resetting; please wait' -e 'sudo service onos restart'
-Comment[en_US]=
-EOF
-
-
-echo "sudo service onos start > /dev/null 2>&1" >> ~/.profile
diff --git a/tutorial1-setup.sh b/tutorial1-setup.sh
deleted file mode 100644
index eac65c0..0000000
--- a/tutorial1-setup.sh
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/bash
-# vm-setup.sh
-#  
-# This script installs ONOS dependencies and installs a desktop environment on a Miniet VM.
-
-
-export CURRENT_USER=tutorial1
-export USER_HOME=/home/${CURRENT_USER}
-
-
-# -------------- Setup keys -------------------
-
-mkdir -p ~/.ssh
-ssh-keygen -t dsa -P "" -f .ssh/id_dsa  
-cp .ssh/id_dsa.pub .ssh/authorized_keys
-
-# -------------- Install Karaf ----------------
-
-mkdir Downloads
-cd Downloads
-wget http://apache.osuosl.org/karaf/3.0.2/apache-karaf-3.0.2.zip
-cd -
-
-# -------------- Setup Wireshark dissector ----
-
-wget -O openflow.lua "https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=openflow.lua"
-mkdir -p .wireshark/plugins
-mv openflow.lua .wireshark/plugins
-
-
-
-# -------------- Setup Desktop ----------------
-
-sudo apt-get install -y xorg lxde systemd-shim
-
-#TODO: add backgrounds folder
-sudo mkdir -p /usr/share/backgrounds
-#TODO: change background
-# Remove wallpaper, change background color
-sudo sed -i 's/wallpaper_mode=1/wallpaper_mode=0/g' /usr/share/lxde/pcmanfm/LXDE.conf
-sudo sed -i 's/desktop_bg=#000000/desktop_bg=#104187/g' /usr/share/lxde/pcmanfm/LXDE.conf
-
-sudo sed -i 's/lang=1/lang=0/g' /etc/lxdm/default.conf
-sudo sed -i 's/bottom_pane=1/bottom_pane=0/g' /etc/lxdm/default.conf
-sudo sed -i 's/disable=0/disable=1/g' /etc/lxdm/default.conf
-
-# Allow VM to be rebooted from GUI
-echo "session required pam_systemd.so" | sudo tee --append /etc/pam.d/lxdm
-
-wget -O onos.png "https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=onos.png"
-sudo cp onos.png /usr/share/backgrounds/default.png
-
-# Automatically start LXDE on login
-echo '[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx' >> ~/.bashrc
-
-# Automatically log into the VM
-#sudo sed -i 's/exec /sbin/getty -8 38400 tty1//g' /etc/init/tty1.conf
-#sudo sed -i '$ d' /etc/init/tty1.conf
-#echo 'exec /bin/login -f bob < /dev/tty1 > /dev/tty1 2>&1' | sudo tee -a /etc/init/tty1.conf
-
-echo "sudo service onos start > /dev/null 2>&1" >> ~/.profile
-
-# Disable screensaver
-sudo sed -i '/screensaver/d' /etc/xdg/lxsession/LXDE/autostart
-cat > ${USER_HOME}/.xsessionrc << EOF
-# disable screensaver
-xset s off
-# disable dpms (standby)
-xset -dpms
-EOF
-
-# Change LXTerminal default colors
-#sudo sed -i 's/bgcolor=#000000000000/bgcolor=#ffffffffffff/g' ${USER_HOME}/.config/lxterminal/lxterminal.conf
-#sudo sed -i 's/fgcolor=#aaaaaaaaaaaa/fgcolor=#000000000000/g' ${USER_HOME}/.config/lxterminal/lxterminal.conf
-sudo sed -i 's/bgcolor=#000000000000/bgcolor=#ffffffffffff/g' /usr/share/lxterminal/lxterminal.conf
-sudo sed -i 's/fgcolor=#aaaaaaaaaaaa/fgcolor=#000000000000/g' /usr/share/lxterminal/lxterminal.conf
-
-DESKTOP=${USER_HOME}/Desktop
-
-mkdir -p ${DESKTOP}
-
-cat > ${DESKTOP}/ONOS << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=ONOS
-Name[en_US]=ONOS
-Icon=konsole
-Exec=/usr/bin/lxterminal -e '/opt/onos/apache-karaf-3.0.2/bin/client -u karaf'
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/Mininet << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Mininet
-Name[en_US]=Mininet
-Icon=konsole
-Exec=/usr/bin/lxterminal -e 'sudo mn --custom /home/tutorial1/onos/tools/test/topos/tower.py --topo tower --controller remote --mac'
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/Tutorial << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=ONOS Tutorial
-Name[en_US]=ONOS Tutorial
-Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser https://wiki.onosproject.org/display/ONOS/Basic+ONOS+Tutorial
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/GUI << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=ONOS GUI
-Name[en_US]=ONOS GUI
-Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser http://localhost:8181/onos/ui/index.html#topo
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/Wireshark << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Wireshark
-Name[en_US]=Wireshark
-Icon=wireshark
-Exec=/usr/bin/wireshark
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/Reset << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Reset
-Name[en_US]=Reset
-Icon=konsole
-Exec=/usr/bin/lxterminal -t 'Resetting; please wait' -e 'sudo service onos restart'
-Comment[en_US]=
-EOF
-
-# ------------- Install Other Tools ------------- 
-sudo apt-get install -y wireshark
-# Enable root-less wireshark and add mininet
-echo "Enabling wireshark group"
-echo "wireshark-common wireshark-common/install-setuid boolean true" | sudo debconf-set-selections 
-sudo dpkg-reconfigure -f noninteractive wireshark-common
-sudo usermod -a -G wireshark mininet
-sudo usermod -a -G wireshark tutorial1
-
-
-echo "Installing VirtualBox Guest Additions"
-sudo apt-get install -y virtualbox-guest-x11
-
-# ------------- Zero Unused Blocks -------------
-#TODO investigate zerofree
-echo "Zeroing unused blocks"
-sync
-dd if=/dev/zero of=tmp-zeros
-sync
-rm tmp-zeros
-sync
diff --git a/vm-setup.sh b/vm-setup.sh
deleted file mode 100644
index a7d119e..0000000
--- a/vm-setup.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-# vm-setup.sh
-#  
-# This script installs ONOS dependencies and installs a desktop environment on a Mininet VM.
-
-
-export CURRENT_USER=tutorial1
-export SDN_IP_USER=sdnip
-export DIST_USER=distributed
-export OPT_USER=optical
-export USER_HOME=/home/${CURRENT_USER}
-
-URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=tutorial1-setup.sh'
-SDNIP_URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=sdnip-setup.sh'
-DIST_URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=dist-setup.sh'
-OPT_URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=opt-setup.sh'
-
-sudo /usr/sbin/useradd -c "Basic ONOS Tutorial" -d /home/${CURRENT_USER} -U -m -p $(openssl passwd -1 ${CURRENT_USER}) -s /bin/bash ${CURRENT_USER}
-sudo /usr/sbin/useradd -c "Basic SDN-IP Tutorial" -d /home/${SDN_IP_USER} -U -m -p $(openssl passwd -1 ${SDN_IP_USER}) -s /bin/bash ${SDN_IP_USER}
-sudo /usr/sbin/useradd -c "Distributed Tutorial" -d /home/${DIST_USER} -U -m -p $(openssl passwd -1 ${DIST_USER}) -s /bin/bash ${DIST_USER}
-sudo /usr/sbin/useradd -c "Optical Tutorial" -d /home/${OPT_USER} -U -m -p $(openssl passwd -1 ${OPT_USER}) -s /bin/bash ${OPT_USER}
-
-
-echo "${CURRENT_USER} ALL=(ALL) NOPASSWD:ALL" >> tutorial1
-sudo cp tutorial1 /etc/sudoers.d
-sudo chown root:root /etc/sudoers.d/tutorial1
-
-echo "${SDN_IP_USER} ALL=(ALL) NOPASSWD:ALL" >> sdnip
-sudo cp sdnip /etc/sudoers.d
-sudo chown root:root /etc/sudoers.d/sdnip
-
-
-echo "${DIST_USER} ALL=(ALL) NOPASSWD:ALL" >> dist
-sudo cp dist /etc/sudoers.d
-sudo chown root:root /etc/sudoers.d/dist
-
-echo "${OPT_USER} ALL=(ALL) NOPASSWD:ALL" >> opt
-sudo cp opt /etc/sudoers.d
-sudo chown root:root /etc/sudoers.d/opt
-
-sudo apt-get update
-
-sudo apt-get install -y git openjdk-8-jdk maven unzip quagga docker.io curl erlang make gcc wget autoconf openssl libssl0.9.8 libssl-dev libncurses5 libncurses5-dev
-sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
-sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac
-
-#--------------- Setup Mininet ----------------
-
-#git clone git://github.com/mininet/mininet
-
-#mininet/util/install.sh -a
-
-# -------------- Switch User ------------------
-
-wget -O tutorial1-setup.sh $URL
-
-sudo -u ${CURRENT_USER} -H sh -c 'cp tutorial1-setup.sh ~/ && cd ~/ && sh tutorial1-setup.sh'
-
-wget -O sdnip-setup.sh $SDNIP_URL
-
-sudo -u ${SDN_IP_USER} -H sh -c 'cp sdnip-setup.sh ~/ && cd ~/ && sh sdnip-setup.sh'
-
-wget -O dist-setup.sh $DIST_URL
-
-sudo -u ${DIST_USER} -H sh -c 'cp dist-setup.sh ~/ && cd ~/ && sh dist-setup.sh'
-
-wget -O opt-setup.sh $OPT_URL
-
-sudo -u ${OPT_USER} -H sh -c 'cp opt-setup.sh ~/ && cd ~/ && sh opt-setup.sh'