diff --git a/evt-tools.py b/evt-tools.py
index ab4963d..7087c65 100644
--- a/evt-tools.py
+++ b/evt-tools.py
@@ -149,7 +149,7 @@ def main():
         return
 
     if tools.args.tincan:
-        tools.tincan()
+        tools.build_tincan()
         return
 
     if tools.args.debpak:
@@ -188,10 +188,6 @@ def main():
         tools.build_webrtc_release_raspberry()
         return
 
-    if tools.args.tincan:
-        tools.build_tincan()
-        return
-
     if tools.args.tincan_r:
         tools.build_tincan_release_ubuntu()
         return
diff --git a/scripts/evtool-v20.7.2 b/scripts/evtool-v20.7.2
index f4e8fde..c5238c0 100755
--- a/scripts/evtool-v20.7.2
+++ b/scripts/evtool-v20.7.2
@@ -7,7 +7,7 @@ WorkspaceRoot=~/workspace
 Build_WRTC=./EdgeVPNIO/tools/scripts/build_webrtc.sh
 Get_Archives=./EdgeVPNIO/tools/scripts/get_archives.sh
 Get_Include=./EdgeVPNIO/tools/scripts/get_include.sh
-Build_Tincan=./EdgeVPNIO/tools/build_tincan.sh
+Build_Tincan=./EdgeVPNIO/tools/scripts/build_tincan.sh
 function install_build_tools
 {
   sudo bash -c "
@@ -163,45 +163,6 @@ function build_webrtc()
   cd $wd
 }
 
-#function build_webrtc_with_release_ubuntu
-#{
-#  wd=$(pwd)
-#  cd $WorkspaceRoot
-#  chmod +x $Build_WRTC $Get_Archives $Get_Include
-#  $Build_WRTC -b release -t ubuntu
-#  cd $WorkspaceRoot
-#  $Get_Archives -b release -t ubuntu
-#  cd $WorkspaceRoot
-#  $Get_Include -b release -t ubuntu
-#  cd $wd
-#}
-#
-#function build_webrtc_with_debug_raspberry_pi
-#{
-#  wd=$(pwd)
-#  cd $WorkspaceRoot
-#  chmod +x $Build_WRTC $Get_Archives $Get_Include
-#  ./EdgeVPNIO/tools/scripts/build_webrtc.sh -b debug -t raspberry-pi
-#  cd $WorkspaceRoot
-#  ./EdgeVPNIO/tools/scripts/get_archives.sh -b debug -t raspberry-pi
-#  cd $WorkspaceRoot
-#  ./EdgeVPNIO/tools/scripts/get_include.sh -b debug -t raspberry-pi
-#  cd $wd
-#}
-#
-#function build_webrtc_with_release_raspberry_pi
-#{
-#  wd=$(pwd)
-#  cd $WorkspaceRoot
-#  chmod +x $Build_WRTC $Get_Archives $Get_Include
-#  ./EdgeVPNIO/tools/scripts/build_webrtc.sh -b release -t raspberry-pi
-#  cd $WorkspaceRoot
-#  ./EdgeVPNIO/tools/scripts/get_archives.sh -b release -t raspberry-pi
-#  cd $WorkspaceRoot
-#  ./EdgeVPNIO/tools/scripts/get_include.sh -b release -t raspberry-pi
-#  cd $wd
-#}
-
 function build_tincan() {
   wd=$(pwd)
   cd $WorkspaceRoot
@@ -210,30 +171,6 @@ function build_tincan() {
   cd $wd
 }
 
-#function build_tincan_release_ubuntu {
-#  wd=$(pwd)
-#  cd $WorkspaceRoot
-#  chmod +x ./EdgeVPNIO/tools/build_tincan.sh
-#  ./EdgeVPNIO/tools/scripts/build_tincan.sh  -b release -t ubuntu
-#  cd $wd
-#}
-#
-#function build_tincan_debug_raspberry {
-#  wd=$(pwd)
-#  cd $WorkspaceRoot
-#  chmod +x ./EdgeVPNIO/tools/build_tincan.sh
-#  ./EdgeVPNIO/tools/scripts/build_tincan.sh  -b debug -t raspberry-pi
-#  cd $wd
-#}
-#
-#function build_tincan_release_raspberry {
-#  wd=$(pwd)
-#  cd $WorkspaceRoot
-#  chmod +x ./EdgeVPNIO/tools/build_tincan.sh
-#  ./EdgeVPNIO/tools/scripts/build_tincan.sh  -b debug -t raspberry-pi
-#  cd $wd
-#}
-
 function do_full_setup
 {
   install_build_tools