diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 79b3c94..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
-</project>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4577287..22c9786 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,6 +312,7 @@ set(DSS_SOURCE_FILES
         QTFileLib/QTRTPFile.h
         QTFileLib/QTTrack.cpp
         QTFileLib/QTTrack.h
+        QTFileTools/QTFileTest.tproj/QTFileTest.cpp
         QTFileTools/QTRTPFileTest.tproj/QTRTPFileTest.cpp
         QTFileTools/QTRTPGen.tproj/QTRTPGen.cpp
         QTFileTools/QTSampleLister.tproj/QTSampleLister.cpp
@@ -345,7 +346,7 @@ set(DSS_SOURCE_FILES
         RTSPClientLib/RTPPacket.h
         RTSPClientLib/RTSPClient.cpp
         RTSPClientLib/RTSPClient.h
-#        SafeStdLib/DynamicModuleStdLib.cpp
+        SafeStdLib/DynamicModuleStdLib.cpp
         SafeStdLib/InternalStdLib.cpp
         Server.tproj/GenerateXMLPrefs.cpp
         Server.tproj/GenerateXMLPrefs.h
@@ -432,7 +433,6 @@ set(DSS_SOURCE_FILES
         revision.h)
 
 add_executable(DarwinStreamingServer ${DSS_SOURCE_FILES})
-target_link_libraries(DarwinStreamingServer pthread crypt dl m stdc++)
 
 add_executable(StreamingLoadTool StreamingLoadTool/StreamingLoadTool.cpp)
 
@@ -495,39 +495,9 @@ add_executable(MP3Broadcaster ${MP3_BROADCASTER_SOURCE_FILES})
 
 add_executable(QTBroadcaster QTFileTools/QTBroadcaster.tproj/QTBroadcaster.cpp)
 
-set(QTFILELIB_COMMON_SOURCE_FILES
-        SafeStdLib/InternalStdLib.cpp
-        CommonUtilitiesLib/DateTranslator.cpp
-        CommonUtilitiesLib/MyAssert.cpp
-        CommonUtilitiesLib/OS.cpp
-        CommonUtilitiesLib/OSCond.cpp
-        CommonUtilitiesLib/OSFileSource.cpp
-        CommonUtilitiesLib/OSMutex.cpp
-        CommonUtilitiesLib/OSQueue.cpp
-        CommonUtilitiesLib/StringParser.cpp
-        CommonUtilitiesLib/StrPtrLen.cpp
-        RTPMetaInfoLib/RTPMetaInfoPacket.cpp
-        QTFileLib/QTAtom.cpp
-        QTFileLib/QTAtom_dref.cpp
-        QTFileLib/QTAtom_elst.cpp
-        QTFileLib/QTAtom_hinf.cpp
-        QTFileLib/QTAtom_mdhd.cpp
-        QTFileLib/QTAtom_mvhd.cpp
-        QTFileLib/QTAtom_stco.cpp
-        QTFileLib/QTAtom_stsc.cpp
-        QTFileLib/QTAtom_stsd.cpp
-        QTFileLib/QTAtom_stss.cpp
-        QTFileLib/QTAtom_stsz.cpp
-        QTFileLib/QTAtom_stts.cpp
-        QTFileLib/QTAtom_tkhd.cpp
-        QTFileLib/QTAtom_tref.cpp
+set(QTFILEINFO_SOURCE_FILES
         QTFileLib/QTFile.cpp
-        QTFileLib/QTHintTrack.cpp
-        QTFileLib/QTTrack.cpp
-        QTFileLib/QTFile_FileControlBlock.cpp)
+        QTFileLib/QTFile.h
+        QTFileTools/QTFileInfo.tproj/QTFileInfo.cpp)
 
-add_executable(QTFileInfo ${QTFILELIB_COMMON_SOURCE_FILES} QTFileTools/QTFileInfo.tproj/QTFileInfo.cpp)
-target_link_libraries(QTFileInfo pthread)
-
-add_executable(QTFileTest ${QTFILELIB_COMMON_SOURCE_FILES} QTFileTools/QTFileTest.tproj/QTFileTest.cpp)
-target_link_libraries(QTFileTest pthread)
\ No newline at end of file
+add_executable(QTFileInfo ${QTFILEINFO_SOURCE_FILES})
\ No newline at end of file
diff --git a/gdb_script b/gdb_script
deleted file mode 100644
index d27d87d..0000000
--- a/gdb_script
+++ /dev/null
@@ -1,27 +0,0 @@
-dir Server.tproj
-dir APICommonCode
-dir APIModules/OSMemory_Modules
-dir APIModules/QTSSAccessLogModule
-dir APIModules/QTSSFileModule
-dir APIModules/QTSSFlowControlModule
-dir APIModules/QTSSReflectorModule
-dir APIModules/QTSSDSAuthModule
-dir APIModules/QTSSWebDebugModule
-dir APIModules/QTSSWebStatsModule
-dir APIModules/QTSSDemoAuthorizationModule.bproj
-dir APIModules/QTSSAccessModule
-dir APIModules/QTSSAdminModule
-dir APIStubLib
-dir CommonUtilitiesLib
-dir OSMemoryLib
-dir PlaylistBroadcaster.tproj
-dir PrefsSourceLib
-dir QTFileLib
-dir RTSPClientLib
-dir RTCPUtilitiesLib
-handle SIGPIPE nopass noprint 
-
-
-
-
-
diff --git a/gdbdar b/gdbdar
deleted file mode 100755
index 3f33b62..0000000
--- a/gdbdar
+++ /dev/null
@@ -1 +0,0 @@
-gdb ./DarwinStreamingServer -x gdb_script
diff --git a/gdbmp3 b/gdbmp3
deleted file mode 100755
index ef4a342..0000000
--- a/gdbmp3
+++ /dev/null
@@ -1 +0,0 @@
-gdb build/MP3Broadcaster -x gdb_script
diff --git a/gdbplay b/gdbplay
deleted file mode 100755
index 52a2af2..0000000
--- a/gdbplay
+++ /dev/null
@@ -1,15 +0,0 @@
-
-echo $HOSTTYPE
-if [ "$HOSTTYPE" = "powerpc" ] ; then
-	if [ "$1" = "jam" ] ; then
-		echo "Debug OSX Jam'd PlaylistBroadcaster/PlaylistBroadcaster"
-		gdb PlaylistBroadcaster.tproj/PlaylistBroadcaster -x gdb_script
-	else
-		echo "Debug OSX PlaylistBroadcaster"
-		gdb build/PlaylistBroadcaster -x gdb_script
-	fi
-else
-	echo "Debug POSIX PlaylistBroadcaster.tproj/PlaylistBroadcaster"
-	gdb PlaylistBroadcaster.tproj/PlaylistBroadcaster -x gdb_script
-fi
-
diff --git a/gdbserver b/gdbserver
deleted file mode 100755
index b14d2ae..0000000
--- a/gdbserver
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ -e build/Development/QuickTimeStreamingServer ] ; then
-   gdb build/Development/QuickTimeStreamingServer -x gdb_script
-else
-	if [ -e build/Deployment/QuickTimeStreamingServer ] ; then
-	   gdb build/Deployment/QuickTimeStreamingServer -x gdb_script
-	else
-	   echo "Build not found!"
-	   exit 1
-	fi
-fi