diff --git a/Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb b/Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb
index 18007ebf..3db28559 100644
--- a/Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb
+++ b/Jobs/EDMI/ZUGFeRD/ImportZUGFeRDFiles.vb
@@ -320,7 +320,6 @@ Public Class ImportZUGFeRDFiles
 
                                     _logger.Debug("Done Fetching Property values.")
 
-
                                     Dim oIndexesToRemove As New List(Of Integer)
 
                                     For oRowIndex = 0 To oRowCount - 1
@@ -337,14 +336,19 @@ Public Class ImportZUGFeRDFiles
                                         If oColumnIsEmpty Then
                                             oIndexesToRemove.Add(oRowIndex)
                                         End If
-
-
-
-                                        Console.WriteLine($"Column is empty: {oColumnIsEmpty}")
                                     Next
 
-                                    ' TODO: Remove Empty Rows by `oIndexesToRemove`!
+                                    oIndexesToRemove = oIndexesToRemove.
+                                        OrderByDescending(Function(oIndex) oIndex).
+                                        ToList()
 
+                                    For Each oIndex In oIndexesToRemove
+                                        For Each oRow In oPropertyList
+                                            oRow.Value.RemoveAt(oIndex)
+                                        Next
+                                    Next
+
+                                    oRowCount -= oIndexesToRemove.Count
 
                                     ' Structure of oPropertyList
                                     ' [ # Propertyname       # Row 1              # Row 2