diff --git a/functionmap.go b/functionmap.go
index 49718a2..f6d0edb 100644
--- a/functionmap.go
+++ b/functionmap.go
@@ -20,8 +20,8 @@ func FunctionByServiceAndFunctionName(serviceName, functionName string) (Functio
 		functionMap = EventFunctionMap
 	case AnalyticsWebService:
 		functionMap = AnalyticsFunctionMap
-	case ImagingWebService:
-		functionMap = ImagingFunctionMap
+	//case ImagingWebService:
+	//		functionMap = ImagingFunctionMap
 	case RecordingWebService:
 		functionMap = RecordingFunctionMap
 	default:
diff --git a/mappings.go b/mappings.go
index 2f6726b..7bf4eb9 100644
--- a/mappings.go
+++ b/mappings.go
@@ -12,7 +12,6 @@ import (
 	"github.com/kerberos-io/onvif/analytics"
 	"github.com/kerberos-io/onvif/device"
 	"github.com/kerberos-io/onvif/event"
-	"github.com/kerberos-io/onvif/imaging"
 	"github.com/kerberos-io/onvif/media"
 	"github.com/kerberos-io/onvif/media2"
 	"github.com/kerberos-io/onvif/ptz"
@@ -141,7 +140,7 @@ var EventFunctionMap = map[string]Function{
 	Unsubscribe:                 &event.UnsubscribeFunction{},
 }
 
-var ImagingFunctionMap = map[string]Function{
+/*var ImagingFunctionMap = map[string]Function{
 	GetCurrentPreset:       &imaging.GetCurrentPresetFunction{},
 	GetImagingSettings:     &imaging.GetImagingSettingsFunction{},
 	GetMoveOptions:         &imaging.GetMoveOptionsFunction{},
@@ -153,7 +152,7 @@ var ImagingFunctionMap = map[string]Function{
 	SetCurrentPreset:       &imaging.SetCurrentPresetFunction{},
 	SetImagingSettings:     &imaging.SetImagingSettingsFunction{},
 	Stop:                   &imaging.StopFunction{},
-}
+}*/
 
 var MediaFunctionMap = map[string]Function{
 	AddAudioDecoderConfiguration:               &media.AddAudioDecoderConfigurationFunction{},
diff --git a/xsd/onvif/onvif.go b/xsd/onvif/onvif.go
index adc48dd..4c8106b 100644
--- a/xsd/onvif/onvif.go
+++ b/xsd/onvif/onvif.go
@@ -1840,8 +1840,8 @@ type RelayOutputSettings struct {
 }
 
 type DigitalInput struct {
-	Token ReferenceToken `xml:"token,attr"`
-	IdleState 	InputIdleState `xml:"IdleState,attr"`
+	Token     ReferenceToken `xml:"token,attr"`
+	IdleState InputIdleState `xml:"IdleState,attr"`
 }
 
 // TODO:enumeration