diff --git a/Functions/DCIM/Devices/Get-NetboxDCIMDevice.ps1 b/Functions/DCIM/Devices/Get-NetboxDCIMDevice.ps1
index 34184e3..aa61dd0 100644
--- a/Functions/DCIM/Devices/Get-NetboxDCIMDevice.ps1
+++ b/Functions/DCIM/Devices/Get-NetboxDCIMDevice.ps1
@@ -73,10 +73,6 @@ function Get-NetboxDCIMDevice {
     #endregion Parameters
 
     process {
-        if ($null -ne $Status) {
-            $PSBoundParameters.Status = ValidateDCIMChoice -ProvidedValue $Status -DeviceStatus
-        }
-
         $Segments = [System.Collections.ArrayList]::new(@('dcim', 'devices'))
 
         $URIComponents = BuildURIComponents -URISegments $Segments.Clone() -ParametersDictionary $PSBoundParameters -SkipParameterByName 'Raw'
diff --git a/Functions/DCIM/Devices/New-NetboxDCIMDevice.ps1 b/Functions/DCIM/Devices/New-NetboxDCIMDevice.ps1
index ed9a51d..86ddbdd 100644
--- a/Functions/DCIM/Devices/New-NetboxDCIMDevice.ps1
+++ b/Functions/DCIM/Devices/New-NetboxDCIMDevice.ps1
@@ -52,22 +52,6 @@ function New-NetboxDCIMDevice {
     )
     #endregion Parameters
 
-    #    if ($null -ne $Device_Role) {
-    #        # Validate device role?
-    #    }
-
-    #    if ($null -ne $Device_Type) {
-    #        # Validate device type?
-    #    }
-
-    #    if ($null -ne $Status) {
-    #        $PSBoundParameters.Status = ValidateDCIMChoice -ProvidedValue $Status -DeviceStatus
-    #    }
-
-    #    if ($null -ne $Face) {
-    #        $PSBoundParameters.Face = ValidateDCIMChoice -ProvidedValue $Face -DeviceFace
-    #    }
-
     $Segments = [System.Collections.ArrayList]::new(@('dcim', 'devices'))
 
     $URIComponents = BuildURIComponents -URISegments $Segments.Clone() -ParametersDictionary $PSBoundParameters
diff --git a/Functions/DCIM/Devices/Set-NetboxDCIMDevice.ps1 b/Functions/DCIM/Devices/Set-NetboxDCIMDevice.ps1
index 04e7cb2..84e9ac0 100644
--- a/Functions/DCIM/Devices/Set-NetboxDCIMDevice.ps1
+++ b/Functions/DCIM/Devices/Set-NetboxDCIMDevice.ps1
@@ -51,13 +51,7 @@ function Set-NetboxDCIMDevice {
     )
 
     begin {
-#        if ($null -ne $Status) {
-#            $PSBoundParameters.Status = ValidateDCIMChoice -ProvidedValue $Status -DeviceStatus
-#        }
 
-#        if ($null -ne $Face) {
-#            $PSBoundParameters.Face = ValidateDCIMChoice -ProvidedValue $Face -DeviceFace
-#        }
     }
 
     process {
diff --git a/Functions/DCIM/Interfaces/Add-NetboxDCIMInterface.ps1 b/Functions/DCIM/Interfaces/Add-NetboxDCIMInterface.ps1
index d60129f..d9215f2 100644
--- a/Functions/DCIM/Interfaces/Add-NetboxDCIMInterface.ps1
+++ b/Functions/DCIM/Interfaces/Add-NetboxDCIMInterface.ps1
@@ -34,10 +34,6 @@ function Add-NetboxDCIMInterface {
         [uint16[]]$Tagged_VLANs
     )
 
-#    if ($null -ne $Form_Factor) {
-#        $PSBoundParameters.Form_Factor = ValidateDCIMChoice -ProvidedValue $Form_Factor -InterfaceFormFactor
-#    }
-
     if (-not [System.String]::IsNullOrWhiteSpace($Mode)) {
         $PSBoundParameters.Mode = switch ($Mode) {
             'Access' {
diff --git a/Functions/DCIM/Interfaces/Add-NetboxDCIMInterfaceConnection.ps1 b/Functions/DCIM/Interfaces/Add-NetboxDCIMInterfaceConnection.ps1
index 438654f..a0c141d 100644
--- a/Functions/DCIM/Interfaces/Add-NetboxDCIMInterfaceConnection.ps1
+++ b/Functions/DCIM/Interfaces/Add-NetboxDCIMInterfaceConnection.ps1
@@ -36,10 +36,6 @@ function Add-NetboxDCIMInterfaceConnection {
         [uint16]$Interface_B
     )
 
-    if ($null -ne $Connection_Status) {
-        $PSBoundParameters.Connection_Status = ValidateDCIMChoice -ProvidedValue $Connection_Status -InterfaceConnectionStatus
-    }
-
     # Verify if both Interfaces exist
     Get-NetboxDCIMInterface -Id $Interface_A -ErrorAction Stop | Out-null
     Get-NetboxDCIMInterface -Id $Interface_B -ErrorAction Stop | Out-null
diff --git a/Functions/DCIM/Interfaces/Get-NetboxDCIMInterface.ps1 b/Functions/DCIM/Interfaces/Get-NetboxDCIMInterface.ps1
index 6fe7330..7dc8222 100644
--- a/Functions/DCIM/Interfaces/Get-NetboxDCIMInterface.ps1
+++ b/Functions/DCIM/Interfaces/Get-NetboxDCIMInterface.ps1
@@ -35,10 +35,6 @@ function Get-NetboxDCIMInterface {
     )
 
     process {
-        if ($null -ne $Form_Factor) {
-            $PSBoundParameters.Form_Factor = ValidateDCIMChoice -ProvidedValue $Form_Factor -InterfaceFormFactor
-        }
-
         $Segments = [System.Collections.ArrayList]::new(@('dcim', 'interfaces'))
 
         $URIComponents = BuildURIComponents -URISegments $Segments.Clone() -ParametersDictionary $PSBoundParameters
diff --git a/Functions/DCIM/Interfaces/Get-NetboxDCIMInterfaceConnection.ps1 b/Functions/DCIM/Interfaces/Get-NetboxDCIMInterfaceConnection.ps1
index 9c90579..71513e0 100644
--- a/Functions/DCIM/Interfaces/Get-NetboxDCIMInterfaceConnection.ps1
+++ b/Functions/DCIM/Interfaces/Get-NetboxDCIMInterfaceConnection.ps1
@@ -19,10 +19,6 @@ function Get-NetboxDCIMInterfaceConnection {
         [switch]$Raw
     )
 
-    if ($null -ne $Connection_Status) {
-        $PSBoundParameters.Connection_Status = ValidateDCIMChoice -ProvidedValue $Connection_Status -InterfaceConnectionStatus
-    }
-
     $Segments = [System.Collections.ArrayList]::new(@('dcim', 'interface-connections'))
 
     $URIComponents = BuildURIComponents -URISegments $Segments.Clone() -ParametersDictionary $PSBoundParameters -SkipParameterByName 'Raw'
diff --git a/Functions/DCIM/Interfaces/Set-NetboxDCIMInterface.ps1 b/Functions/DCIM/Interfaces/Set-NetboxDCIMInterface.ps1
index de7d5f2..0288ac0 100644
--- a/Functions/DCIM/Interfaces/Set-NetboxDCIMInterface.ps1
+++ b/Functions/DCIM/Interfaces/Set-NetboxDCIMInterface.ps1
@@ -38,10 +38,6 @@ function Set-NetboxDCIMInterface {
     )
 
     begin {
-        #        if ($null -ne $Form_Factor) {
-        #            $PSBoundParameters.Form_Factor = ValidateDCIMChoice -ProvidedValue $Form_Factor -InterfaceFormFactor
-        #        }
-
         if (-not [System.String]::IsNullOrWhiteSpace($Mode)) {
             $PSBoundParameters.Mode = switch ($Mode) {
                 'Access' {
diff --git a/Functions/DCIM/Interfaces/Set-NetboxDCIMInterfaceConnection.ps1 b/Functions/DCIM/Interfaces/Set-NetboxDCIMInterfaceConnection.ps1
index 299d278..d333560 100644
--- a/Functions/DCIM/Interfaces/Set-NetboxDCIMInterfaceConnection.ps1
+++ b/Functions/DCIM/Interfaces/Set-NetboxDCIMInterfaceConnection.ps1
@@ -47,10 +47,6 @@ function Set-NetboxDCIMInterfaceConnection {
     )
 
     begin {
-#        if ($null -ne $Connection_Status) {
-#            $PSBoundParameters.Connection_Status = ValidateDCIMChoice -ProvidedValue $Connection_Status -InterfaceConnectionStatus
-#        }
-
         if ((@($ID).Count -gt 1) -and ($Interface_A -or $Interface_B)) {
             throw "Cannot set multiple connections to the same interface"
         }