diff --git a/gameserver/utils/content/build_tab.sh b/gameserver/utils/content/build_tab.sh
deleted file mode 100755
index 97f5e5b..0000000
--- a/gameserver/utils/content/build_tab.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-server=$(find ./dsrc/sku.0/sys.server/compiled/game/datatables -name '*.tab')
-inc=$(find ./dsrc/sku.0/sys.shared/compiled/game/datatables/include -name '*.tab')
-shared=$(find ./dsrc/sku.0/sys.shared/compiled/game/datatables -name '*.tab')
-
-filenames=("${server[@]}" "${inc[@]}" "${shared[@]}")
-
-spinstr='|/-\'
-i=0
-current=0
-total=$(ls ${filenames[@]} | wc -l)
-
-for filename in ${filenames[@]}; do
-	ofilename=${filename/dsrc/data}
-	ofilename=${ofilename/.tab/.iff}
-	mkdir -p $(dirname $ofilename)	
-
-    if [[ -e $ofilename && $filename -nt $ofilename ]] || [ ! -e $ofilename ]; then
-		result=$(./bin/DataTableTool -i "$filename" -o "$ofilename" -- -s SharedFile searchPath10=data/sku.0/sys.shared/compiled/game searchPath10=data/sku.0/sys.server/compiled/game 2>&1)
-
-    	if [[ ! $result =~ .*SUCCESS.* ]]; then
-    		printf "\r$filename\n"
-			printf "$result\n\n"
-    	fi
-	fi
-
-    current=$((current+1))
-    i=$(( (i+1) %4 ))
-    perc=$(bc -l <<< "scale=0; $current*100/$total")
-    printf "\rGenerating Datatables: [${spinstr:$i:1}] $perc%%"
-done
-
-echo ""
diff --git a/gameserver/utils/content/build_tab_multi.sh b/gameserver/utils/content/build_tab_multi.sh
index 12b8702..468a400 100755
--- a/gameserver/utils/content/build_tab_multi.sh
+++ b/gameserver/utils/content/build_tab_multi.sh
@@ -18,7 +18,7 @@ compile () {
 
         [ -e $ofilename ] && rm "$ofilename"
 
-        result=$(./exe/linux/bin/DataTableTool -i "$filename" -- -s SharedFile searchPath10=data/sku.0/sys.shared/compiled/game searchPath10=data/sku.0/sys.server/compiled/game 2>&1)
+        result=$(./bin/DataTableTool -i "$filename" -- -s SharedFile searchPath10=data/sku.0/sys.shared/compiled/game searchPath10=data/sku.0/sys.server/compiled/game 2>&1)
 
         if [[ ! $result =~ .*SUCCESS.* ]]; then
                 printf "\r$filename\n"
diff --git a/gameserver/utils/content/build_tpf.sh b/gameserver/utils/content/build_tpf.sh
deleted file mode 100755
index 670da6f..0000000
--- a/gameserver/utils/content/build_tpf.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-filenames=$(find ./dsrc -name '*.tpf')
-spinstr='|/-\'
-i=0
-current=0
-total=$(find ./dsrc -name '*.tpf' | wc -l)
-
-for filename in $filenames; do
-	ofilename=${filename/dsrc/data}
-    ofilename=${ofilename/.tpf/.iff}
-	mkdir -p $(dirname $ofilename)
-
-    if [[ -e $ofilename && $filename -nt $ofilename ]] || [ ! -e $ofilename ]; then
-        result=$(./exe/linux/bin/TemplateCompiler -compile "$filename" 2>&1)
-    
-        if [[ ! -z $result ]]; then
-        	printf "\r$filename\n"
-            printf "$result\n\n"
-        fi
-    fi
-
-    current=$((current+1))        
-    i=$(( (i+1) %4 ))
-    perc=$(bc -l <<< "scale=0; $current*100/$total")
-    printf "\rGenerating Object Templates: [${spinstr:$i:1}] $perc%%"
-done
-
-echo ""
diff --git a/gameserver/utils/entrypoint.sh b/gameserver/utils/entrypoint.sh
index 4e259ee..3ee0e14 100755
--- a/gameserver/utils/entrypoint.sh
+++ b/gameserver/utils/entrypoint.sh
@@ -6,7 +6,7 @@ if [[ -z "${SWG_BUILD_DSRC}" ]]; then
 else
 	echo "Building DSRC"
 	$basedir/utils/content/build_miff.sh
-	$basedir/utils/content/build_tab.sh
+	$basedir/utils/content/build_tab_multi.sh
 	$basedir/utils/content/build_tpf_multi.sh
 
 	$basedir/utils/content/build_object_template_crc_string_tables.py