diff --git a/ImportExcel.psm1 b/ImportExcel.psm1
index 756362f..72a7a99 100644
--- a/ImportExcel.psm1
+++ b/ImportExcel.psm1
@@ -78,8 +78,7 @@ function Import-Excel {
         $WorkSheetname=1,
         [int]$HeaderRow=1,
         [string[]]$Header,
-        [switch]$NoHeader,
-        [switch]$DataOnly
+        [switch]$NoHeader
     )
 
     Process {
@@ -99,33 +98,14 @@ function Import-Excel {
         $Columns=$dimension.Columns
 
         if($NoHeader) {
-            if ($DataOnly) {
-                $CellsWithValues = $worksheet.Cells | where Value
-
-                $Script:i = 0
-                $ColumnReference = $CellsWithValues | Select-Object -ExpandProperty End | Group-Object Column |
-                    Select-Object @{L='Column';E={$_.Name}}, @{L='NewColumn';E={$Script:i++; $Script:i}}
-                
-                $CellsWithValues | Select-Object -ExpandProperty End | Group-Object Row | ForEach-Object {    
-                    $newRow = [Ordered]@{}
-                    
-                    foreach ($C in $ColumnReference) {
-                        $newRow."P$($C.NewColumn)" = $worksheet.Cells[($_.Name),($C.Column)].Value
-                    }
-
-                    [PSCustomObject]$newRow
+            foreach ($Row in 0..($Rows-1)) {
+                $newRow = [Ordered]@{}
+                foreach ($Column in 0..($Columns-1)) {
+                    $propertyName = "P$($Column+1)"
+                    $newRow.$propertyName = $worksheet.Cells[($Row+1),($Column+1)].Value
                 }
-            }
-            else {
-                foreach ($Row in 0..($Rows-1)) {
-                    $newRow = [Ordered]@{}
-                    foreach ($Column in 0..($Columns-1)) {
-                        $propertyName = "P$($Column+1)"
-                        $newRow.$propertyName = $worksheet.Cells[($Row+1),($Column+1)].Value
-                    }
 
-                    [PSCustomObject]$newRow
-                }
+                [PSCustomObject]$newRow
             }
         } else {
             if(!$Header) {
@@ -136,36 +116,16 @@ function Import-Excel {
 
             if($Rows -eq 1) {
                 $Header | ForEach {$h=[Ordered]@{}} {$h.$_=''} {[PSCustomObject]$h}
-            } 
-            else {
-                if ($DataOnly) {
-                    $CellsWithValues = $worksheet.Cells | where Value
-
-                    $Script:i = -1
-                    $ColumnReference = $CellsWithValues | Select-Object -ExpandProperty End | Group-Object Column |
-                        Select-Object @{L='Column';E={$_.Name}}, @{L='NewColumn';E={$Script:i++; $Header[$Script:i]}}
-                
-                    $CellsWithValues | Select-Object -ExpandProperty End | Group-Object Row | ForEach-Object {    
-                        $newRow = [Ordered]@{}
-                    
-                        foreach ($C in $ColumnReference) {
-                            $newRow."$($C.NewColumn)" = $worksheet.Cells[($_.Name),($C.Column)].Value
-                        }
-
-                        [PSCustomObject]$newRow
-                    }
-                }
-                else {
-                    foreach ($Row in ($HeaderRow+1)..$Rows) {
-                        $h=[Ordered]@{}
-                                            foreach ($Column in 0..($Columns-1)) {
+            } else {
+                foreach ($Row in ($HeaderRow+1)..$Rows) {
+                    $h=[Ordered]@{}
+                    foreach ($Column in 0..($Columns-1)) {
                         if($Header[$Column].Length -gt 0) {
                             $Name    = $Header[$Column]
                             $h.$Name = $worksheet.Cells[$Row,($Column+1)].Value
                         }
                     }
-                        [PSCustomObject]$h
-                    }
+                    [PSCustomObject]$h
                 }
             }
         }