diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb
index 674d0bc..923e763 100644
--- a/Global_Indexer/frmStart.vb
+++ b/Global_Indexer/frmStart.vb
@@ -46,7 +46,7 @@ Public Class frmStart
         Cursor = Cursors.WaitCursor
         Try
             IndexForm = New frmIndex()
-            FileDrop = New FileDrop(LOGCONFIG)
+            FileDrop = New FileDrop(LOGCONFIG, "GLOBIX")
 
             'Lizenz abgellaufen, überprüfen ob User Admin ist
             If LICENSE_COUNT < USERCOUNT_LOGGED_IN Then
@@ -200,8 +200,6 @@ Public Class frmStart
         Try
             DATABASE_ECM.ExecuteNonQuery($"DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')")
 
-
-            'TODO: finish
             For Each oDroppedFile In pDroppedFiles
                 LOGGER.Info("Checking Dropped File: [{0}]", oDroppedFile.FilePath)
                 Dim oDropType = oDroppedFile.DropType
@@ -289,6 +287,8 @@ Public Class frmStart
             ' Clear all temp files after indexing
             Clear_Tempfiles()
             EMAIL.Clear_TempFiles()
+            FileDrop.RemoveTempDirectory()
+
         End Try
     End Sub
 
@@ -484,8 +484,6 @@ Public Class frmStart
 
     End Sub
 
-
-
     Private Sub TimerFolderWatch_Tick(sender As Object, e As EventArgs) Handles TimerFolderWatch.Tick
         If DATABASE_ECM.DBInitialized = False Then
             TimerFolderWatch.Enabled = False