diff --git a/dcps/av1/av1.go b/dcps/av1/av1.go
index 3d9f17d..5f9683d 100644
--- a/dcps/av1/av1.go
+++ b/dcps/av1/av1.go
@@ -96,15 +96,6 @@ func newAVTransport1ClientsFromGenericClients(genericClients []goupnp.ServiceCli
 	return clients
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// * CurrentURI:
-//
-// * CurrentURIMetaData:
-//
-//
 func (client *AVTransport1) SetAVTransportURI(InstanceID uint32, CurrentURI string, CurrentURIMetaData string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -141,15 +132,6 @@ func (client *AVTransport1) SetAVTransportURI(InstanceID uint32, CurrentURI stri
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// * NextURI:
-//
-// * NextURIMetaData:
-//
-//
 func (client *AVTransport1) SetNextAVTransportURI(InstanceID uint32, NextURI string, NextURIMetaData string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -186,29 +168,10 @@ func (client *AVTransport1) SetNextAVTransportURI(InstanceID uint32, NextURI str
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
 // * NrTracks: allowed value range: minimum=0
-//
-// * MediaDuration:
-//
-// * CurrentURI:
-//
-// * CurrentURIMetaData:
-//
-// * NextURI:
-//
-// * NextURIMetaData:
-//
-// * PlayMedium:
-//
-// * RecordMedium:
-//
-// * WriteStatus:
 func (client *AVTransport1) GetMediaInfo(InstanceID uint32) (NrTracks uint32, MediaDuration string, CurrentURI string, CurrentURIMetaData string, NextURI string, NextURIMetaData string, PlayMedium string, RecordMedium string, WriteStatus string, err error) {
 	// Request structure.
 	request := &struct {
@@ -280,9 +243,6 @@ func (client *AVTransport1) GetMediaInfo(InstanceID uint32) (NrTracks uint32, Me
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -332,27 +292,10 @@ func (client *AVTransport1) GetTransportInfo(InstanceID uint32) (CurrentTranspor
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
 // * Track: allowed value range: minimum=0, step=1
-//
-// * TrackDuration:
-//
-// * TrackMetaData:
-//
-// * TrackURI:
-//
-// * RelTime:
-//
-// * AbsTime:
-//
-// * RelCount:
-//
-// * AbsCount:
 func (client *AVTransport1) GetPositionInfo(InstanceID uint32) (Track uint32, TrackDuration string, TrackMetaData string, TrackURI string, RelTime string, AbsTime string, RelCount int32, AbsCount int32, err error) {
 	// Request structure.
 	request := &struct {
@@ -419,17 +362,6 @@ func (client *AVTransport1) GetPositionInfo(InstanceID uint32) (Track uint32, Tr
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// Return values:
-//
-// * PlayMedia:
-//
-// * RecMedia:
-//
-// * RecQualityModes:
 func (client *AVTransport1) GetDeviceCapabilities(InstanceID uint32) (PlayMedia string, RecMedia string, RecQualityModes string, err error) {
 	// Request structure.
 	request := &struct {
@@ -471,15 +403,10 @@ func (client *AVTransport1) GetDeviceCapabilities(InstanceID uint32) (PlayMedia
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
 // * PlayMode: allowed values: NORMAL
-//
-// * RecQualityMode:
 func (client *AVTransport1) GetTransportSettings(InstanceID uint32) (PlayMode string, RecQualityMode string, err error) {
 	// Request structure.
 	request := &struct {
@@ -516,11 +443,6 @@ func (client *AVTransport1) GetTransportSettings(InstanceID uint32) (PlayMode st
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-//
 func (client *AVTransport1) Stop(InstanceID uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -547,13 +469,11 @@ func (client *AVTransport1) Stop(InstanceID uint32) (err error) {
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Speed: allowed values: 1
-//
-//
+
 func (client *AVTransport1) Play(InstanceID uint32, Speed string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -585,11 +505,6 @@ func (client *AVTransport1) Play(InstanceID uint32, Speed string) (err error) {
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-//
 func (client *AVTransport1) Pause(InstanceID uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -616,11 +531,6 @@ func (client *AVTransport1) Pause(InstanceID uint32) (err error) {
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-//
 func (client *AVTransport1) Record(InstanceID uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -647,15 +557,11 @@ func (client *AVTransport1) Record(InstanceID uint32) (err error) {
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Unit: allowed values: TRACK_NR
-//
-// * Target:
-//
-//
+
 func (client *AVTransport1) Seek(InstanceID uint32, Unit string, Target string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -692,11 +598,6 @@ func (client *AVTransport1) Seek(InstanceID uint32, Unit string, Target string)
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-//
 func (client *AVTransport1) Next(InstanceID uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -723,11 +624,6 @@ func (client *AVTransport1) Next(InstanceID uint32) (err error) {
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-//
 func (client *AVTransport1) Previous(InstanceID uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -754,13 +650,11 @@ func (client *AVTransport1) Previous(InstanceID uint32) (err error) {
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * NewPlayMode: allowed values: NORMAL
-//
-//
+
 func (client *AVTransport1) SetPlayMode(InstanceID uint32, NewPlayMode string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -792,13 +686,6 @@ func (client *AVTransport1) SetPlayMode(InstanceID uint32, NewPlayMode string) (
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// * NewRecordQualityMode:
-//
-//
 func (client *AVTransport1) SetRecordQualityMode(InstanceID uint32, NewRecordQualityMode string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -830,13 +717,6 @@ func (client *AVTransport1) SetRecordQualityMode(InstanceID uint32, NewRecordQua
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// Return values:
-//
-// * Actions:
 func (client *AVTransport1) GetCurrentTransportActions(InstanceID uint32) (Actions string, err error) {
 	// Request structure.
 	request := &struct {
@@ -928,15 +808,6 @@ func newAVTransport2ClientsFromGenericClients(genericClients []goupnp.ServiceCli
 	return clients
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// * CurrentURI:
-//
-// * CurrentURIMetaData:
-//
-//
 func (client *AVTransport2) SetAVTransportURI(InstanceID uint32, CurrentURI string, CurrentURIMetaData string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -973,15 +844,6 @@ func (client *AVTransport2) SetAVTransportURI(InstanceID uint32, CurrentURI stri
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// * NextURI:
-//
-// * NextURIMetaData:
-//
-//
 func (client *AVTransport2) SetNextAVTransportURI(InstanceID uint32, NextURI string, NextURIMetaData string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1018,29 +880,10 @@ func (client *AVTransport2) SetNextAVTransportURI(InstanceID uint32, NextURI str
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
 // * NrTracks: allowed value range: minimum=0
-//
-// * MediaDuration:
-//
-// * CurrentURI:
-//
-// * CurrentURIMetaData:
-//
-// * NextURI:
-//
-// * NextURIMetaData:
-//
-// * PlayMedium:
-//
-// * RecordMedium:
-//
-// * WriteStatus:
 func (client *AVTransport2) GetMediaInfo(InstanceID uint32) (NrTracks uint32, MediaDuration string, CurrentURI string, CurrentURIMetaData string, NextURI string, NextURIMetaData string, PlayMedium string, RecordMedium string, WriteStatus string, err error) {
 	// Request structure.
 	request := &struct {
@@ -1112,31 +955,12 @@ func (client *AVTransport2) GetMediaInfo(InstanceID uint32) (NrTracks uint32, Me
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
 // * CurrentType: allowed values: NO_MEDIA, TRACK_AWARE, TRACK_UNAWARE
 //
 // * NrTracks: allowed value range: minimum=0
-//
-// * MediaDuration:
-//
-// * CurrentURI:
-//
-// * CurrentURIMetaData:
-//
-// * NextURI:
-//
-// * NextURIMetaData:
-//
-// * PlayMedium:
-//
-// * RecordMedium:
-//
-// * WriteStatus:
 func (client *AVTransport2) GetMediaInfo_Ext(InstanceID uint32) (CurrentType string, NrTracks uint32, MediaDuration string, CurrentURI string, CurrentURIMetaData string, NextURI string, NextURIMetaData string, PlayMedium string, RecordMedium string, WriteStatus string, err error) {
 	// Request structure.
 	request := &struct {
@@ -1213,9 +1037,6 @@ func (client *AVTransport2) GetMediaInfo_Ext(InstanceID uint32) (CurrentType str
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -1265,27 +1086,10 @@ func (client *AVTransport2) GetTransportInfo(InstanceID uint32) (CurrentTranspor
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
 // * Track: allowed value range: minimum=0, step=1
-//
-// * TrackDuration:
-//
-// * TrackMetaData:
-//
-// * TrackURI:
-//
-// * RelTime:
-//
-// * AbsTime:
-//
-// * RelCount:
-//
-// * AbsCount:
 func (client *AVTransport2) GetPositionInfo(InstanceID uint32) (Track uint32, TrackDuration string, TrackMetaData string, TrackURI string, RelTime string, AbsTime string, RelCount int32, AbsCount int32, err error) {
 	// Request structure.
 	request := &struct {
@@ -1352,17 +1156,6 @@ func (client *AVTransport2) GetPositionInfo(InstanceID uint32) (Track uint32, Tr
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// Return values:
-//
-// * PlayMedia:
-//
-// * RecMedia:
-//
-// * RecQualityModes:
 func (client *AVTransport2) GetDeviceCapabilities(InstanceID uint32) (PlayMedia string, RecMedia string, RecQualityModes string, err error) {
 	// Request structure.
 	request := &struct {
@@ -1404,15 +1197,10 @@ func (client *AVTransport2) GetDeviceCapabilities(InstanceID uint32) (PlayMedia
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
 // * PlayMode: allowed values: NORMAL
-//
-// * RecQualityMode:
 func (client *AVTransport2) GetTransportSettings(InstanceID uint32) (PlayMode string, RecQualityMode string, err error) {
 	// Request structure.
 	request := &struct {
@@ -1449,11 +1237,6 @@ func (client *AVTransport2) GetTransportSettings(InstanceID uint32) (PlayMode st
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-//
 func (client *AVTransport2) Stop(InstanceID uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1480,13 +1263,11 @@ func (client *AVTransport2) Stop(InstanceID uint32) (err error) {
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Speed: allowed values: 1
-//
-//
+
 func (client *AVTransport2) Play(InstanceID uint32, Speed string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1518,11 +1299,6 @@ func (client *AVTransport2) Play(InstanceID uint32, Speed string) (err error) {
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-//
 func (client *AVTransport2) Pause(InstanceID uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1549,11 +1325,6 @@ func (client *AVTransport2) Pause(InstanceID uint32) (err error) {
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-//
 func (client *AVTransport2) Record(InstanceID uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1580,15 +1351,11 @@ func (client *AVTransport2) Record(InstanceID uint32) (err error) {
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Unit: allowed values: TRACK_NR
-//
-// * Target:
-//
-//
+
 func (client *AVTransport2) Seek(InstanceID uint32, Unit string, Target string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1625,11 +1392,6 @@ func (client *AVTransport2) Seek(InstanceID uint32, Unit string, Target string)
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-//
 func (client *AVTransport2) Next(InstanceID uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1656,11 +1418,6 @@ func (client *AVTransport2) Next(InstanceID uint32) (err error) {
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-//
 func (client *AVTransport2) Previous(InstanceID uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1687,13 +1444,11 @@ func (client *AVTransport2) Previous(InstanceID uint32) (err error) {
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * NewPlayMode: allowed values: NORMAL
-//
-//
+
 func (client *AVTransport2) SetPlayMode(InstanceID uint32, NewPlayMode string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1725,13 +1480,6 @@ func (client *AVTransport2) SetPlayMode(InstanceID uint32, NewPlayMode string) (
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// * NewRecordQualityMode:
-//
-//
 func (client *AVTransport2) SetRecordQualityMode(InstanceID uint32, NewRecordQualityMode string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1763,13 +1511,6 @@ func (client *AVTransport2) SetRecordQualityMode(InstanceID uint32, NewRecordQua
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// Return values:
-//
-// * Actions:
 func (client *AVTransport2) GetCurrentTransportActions(InstanceID uint32) (Actions string, err error) {
 	// Request structure.
 	request := &struct {
@@ -1801,9 +1542,6 @@ func (client *AVTransport2) GetCurrentTransportActions(InstanceID uint32) (Actio
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -1839,15 +1577,6 @@ func (client *AVTransport2) GetDRMState(InstanceID uint32) (CurrentDRMState stri
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// * StateVariableList:
-//
-// Return values:
-//
-// * StateVariableValuePairs:
 func (client *AVTransport2) GetStateVariables(InstanceID uint32, StateVariableList string) (StateVariableValuePairs string, err error) {
 	// Request structure.
 	request := &struct {
@@ -1884,21 +1613,6 @@ func (client *AVTransport2) GetStateVariables(InstanceID uint32, StateVariableLi
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// * AVTransportUDN:
-//
-// * ServiceType:
-//
-// * ServiceId:
-//
-// * StateVariableValuePairs:
-//
-// Return values:
-//
-// * StateVariableList:
 func (client *AVTransport2) SetStateVariables(InstanceID uint32, AVTransportUDN string, ServiceType string, ServiceId string, StateVariableValuePairs string) (StateVariableList string, err error) {
 	// Request structure.
 	request := &struct {
@@ -2010,13 +1724,6 @@ func newConnectionManager1ClientsFromGenericClients(genericClients []goupnp.Serv
 	return clients
 }
 
-//
-//
-// Return values:
-//
-// * Source:
-//
-// * Sink:
 func (client *ConnectionManager1) GetProtocolInfo() (Source string, Sink string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2048,23 +1755,11 @@ func (client *ConnectionManager1) GetProtocolInfo() (Source string, Sink string,
 	return
 }
 
+//
 // Arguments:
 //
-// * RemoteProtocolInfo:
-//
-// * PeerConnectionManager:
-//
-// * PeerConnectionID:
-//
 // * Direction: allowed values: Input, Output
-//
-// Return values:
-//
-// * ConnectionID:
-//
-// * AVTransportID:
-//
-// * RcsID:
+
 func (client *ConnectionManager1) PrepareForConnection(RemoteProtocolInfo string, PeerConnectionManager string, PeerConnectionID int32, Direction string) (ConnectionID int32, AVTransportID int32, RcsID int32, err error) {
 	// Request structure.
 	request := &struct {
@@ -2121,11 +1816,6 @@ func (client *ConnectionManager1) PrepareForConnection(RemoteProtocolInfo string
 	return
 }
 
-// Arguments:
-//
-// * ConnectionID:
-//
-//
 func (client *ConnectionManager1) ConnectionComplete(ConnectionID int32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2152,11 +1842,6 @@ func (client *ConnectionManager1) ConnectionComplete(ConnectionID int32) (err er
 	return
 }
 
-//
-//
-// Return values:
-//
-// * ConnectionIDs:
 func (client *ConnectionManager1) GetCurrentConnectionIDs() (ConnectionIDs string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2183,22 +1868,9 @@ func (client *ConnectionManager1) GetCurrentConnectionIDs() (ConnectionIDs strin
 	return
 }
 
-// Arguments:
-//
-// * ConnectionID:
 //
 // Return values:
 //
-// * RcsID:
-//
-// * AVTransportID:
-//
-// * ProtocolInfo:
-//
-// * PeerConnectionManager:
-//
-// * PeerConnectionID:
-//
 // * Direction: allowed values: Input, Output
 //
 // * Status: allowed values: OK, ContentFormatMismatch, InsufficientBandwidth, UnreliableChannel, Unknown
@@ -2323,13 +1995,6 @@ func newConnectionManager2ClientsFromGenericClients(genericClients []goupnp.Serv
 	return clients
 }
 
-//
-//
-// Return values:
-//
-// * Source:
-//
-// * Sink:
 func (client *ConnectionManager2) GetProtocolInfo() (Source string, Sink string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2361,23 +2026,11 @@ func (client *ConnectionManager2) GetProtocolInfo() (Source string, Sink string,
 	return
 }
 
+//
 // Arguments:
 //
-// * RemoteProtocolInfo:
-//
-// * PeerConnectionManager:
-//
-// * PeerConnectionID:
-//
 // * Direction: allowed values: Input, Output
-//
-// Return values:
-//
-// * ConnectionID:
-//
-// * AVTransportID:
-//
-// * RcsID:
+
 func (client *ConnectionManager2) PrepareForConnection(RemoteProtocolInfo string, PeerConnectionManager string, PeerConnectionID int32, Direction string) (ConnectionID int32, AVTransportID int32, RcsID int32, err error) {
 	// Request structure.
 	request := &struct {
@@ -2434,11 +2087,6 @@ func (client *ConnectionManager2) PrepareForConnection(RemoteProtocolInfo string
 	return
 }
 
-// Arguments:
-//
-// * ConnectionID:
-//
-//
 func (client *ConnectionManager2) ConnectionComplete(ConnectionID int32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2465,11 +2113,6 @@ func (client *ConnectionManager2) ConnectionComplete(ConnectionID int32) (err er
 	return
 }
 
-//
-//
-// Return values:
-//
-// * ConnectionIDs:
 func (client *ConnectionManager2) GetCurrentConnectionIDs() (ConnectionIDs string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2496,22 +2139,9 @@ func (client *ConnectionManager2) GetCurrentConnectionIDs() (ConnectionIDs strin
 	return
 }
 
-// Arguments:
-//
-// * ConnectionID:
 //
 // Return values:
 //
-// * RcsID:
-//
-// * AVTransportID:
-//
-// * ProtocolInfo:
-//
-// * PeerConnectionManager:
-//
-// * PeerConnectionID:
-//
 // * Direction: allowed values: Input, Output
 //
 // * Status: allowed values: OK, ContentFormatMismatch, InsufficientBandwidth, UnreliableChannel, Unknown
@@ -2636,11 +2266,6 @@ func newContentDirectory1ClientsFromGenericClients(genericClients []goupnp.Servi
 	return clients
 }
 
-//
-//
-// Return values:
-//
-// * SearchCaps:
 func (client *ContentDirectory1) GetSearchCapabilities() (SearchCaps string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2667,11 +2292,6 @@ func (client *ContentDirectory1) GetSearchCapabilities() (SearchCaps string, err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * SortCaps:
 func (client *ContentDirectory1) GetSortCapabilities() (SortCaps string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2698,11 +2318,6 @@ func (client *ContentDirectory1) GetSortCapabilities() (SortCaps string, err err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * Id:
 func (client *ContentDirectory1) GetSystemUpdateID() (Id uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2729,29 +2344,11 @@ func (client *ContentDirectory1) GetSystemUpdateID() (Id uint32, err error) {
 	return
 }
 
+//
 // Arguments:
 //
-// * ObjectID:
-//
 // * BrowseFlag: allowed values: BrowseMetadata, BrowseDirectChildren
-//
-// * Filter:
-//
-// * StartingIndex:
-//
-// * RequestedCount:
-//
-// * SortCriteria:
-//
-// Return values:
-//
-// * Result:
-//
-// * NumberReturned:
-//
-// * TotalMatches:
-//
-// * UpdateID:
+
 func (client *ContentDirectory1) Browse(ObjectID string, BrowseFlag string, Filter string, StartingIndex uint32, RequestedCount uint32, SortCriteria string) (Result string, NumberReturned uint32, TotalMatches uint32, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -2823,29 +2420,6 @@ func (client *ContentDirectory1) Browse(ObjectID string, BrowseFlag string, Filt
 	return
 }
 
-// Arguments:
-//
-// * ContainerID:
-//
-// * SearchCriteria:
-//
-// * Filter:
-//
-// * StartingIndex:
-//
-// * RequestedCount:
-//
-// * SortCriteria:
-//
-// Return values:
-//
-// * Result:
-//
-// * NumberReturned:
-//
-// * TotalMatches:
-//
-// * UpdateID:
 func (client *ContentDirectory1) Search(ContainerID string, SearchCriteria string, Filter string, StartingIndex uint32, RequestedCount uint32, SortCriteria string) (Result string, NumberReturned uint32, TotalMatches uint32, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -2917,17 +2491,6 @@ func (client *ContentDirectory1) Search(ContainerID string, SearchCriteria strin
 	return
 }
 
-// Arguments:
-//
-// * ContainerID:
-//
-// * Elements:
-//
-// Return values:
-//
-// * ObjectID:
-//
-// * Result:
 func (client *ContentDirectory1) CreateObject(ContainerID string, Elements string) (ObjectID string, Result string, err error) {
 	// Request structure.
 	request := &struct {
@@ -2969,11 +2532,6 @@ func (client *ContentDirectory1) CreateObject(ContainerID string, Elements strin
 	return
 }
 
-// Arguments:
-//
-// * ObjectID:
-//
-//
 func (client *ContentDirectory1) DestroyObject(ObjectID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3000,15 +2558,6 @@ func (client *ContentDirectory1) DestroyObject(ObjectID string) (err error) {
 	return
 }
 
-// Arguments:
-//
-// * ObjectID:
-//
-// * CurrentTagValue:
-//
-// * NewTagValue:
-//
-//
 func (client *ContentDirectory1) UpdateObject(ObjectID string, CurrentTagValue string, NewTagValue string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3045,15 +2594,6 @@ func (client *ContentDirectory1) UpdateObject(ObjectID string, CurrentTagValue s
 	return
 }
 
-// Arguments:
-//
-// * SourceURI:
-//
-// * DestinationURI:
-//
-// Return values:
-//
-// * TransferID:
 func (client *ContentDirectory1) ImportResource(SourceURI *url.URL, DestinationURI *url.URL) (TransferID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -3090,15 +2630,6 @@ func (client *ContentDirectory1) ImportResource(SourceURI *url.URL, DestinationU
 	return
 }
 
-// Arguments:
-//
-// * SourceURI:
-//
-// * DestinationURI:
-//
-// Return values:
-//
-// * TransferID:
 func (client *ContentDirectory1) ExportResource(SourceURI *url.URL, DestinationURI *url.URL) (TransferID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -3135,11 +2666,6 @@ func (client *ContentDirectory1) ExportResource(SourceURI *url.URL, DestinationU
 	return
 }
 
-// Arguments:
-//
-// * TransferID:
-//
-//
 func (client *ContentDirectory1) StopTransferResource(TransferID uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3166,17 +2692,10 @@ func (client *ContentDirectory1) StopTransferResource(TransferID uint32) (err er
 	return
 }
 
-// Arguments:
-//
-// * TransferID:
 //
 // Return values:
 //
 // * TransferStatus: allowed values: COMPLETED, ERROR, IN_PROGRESS, STOPPED
-//
-// * TransferLength:
-//
-// * TransferTotal:
 func (client *ContentDirectory1) GetTransferProgress(TransferID uint32) (TransferStatus string, TransferLength string, TransferTotal string, err error) {
 	// Request structure.
 	request := &struct {
@@ -3218,11 +2737,6 @@ func (client *ContentDirectory1) GetTransferProgress(TransferID uint32) (Transfe
 	return
 }
 
-// Arguments:
-//
-// * ResourceURI:
-//
-//
 func (client *ContentDirectory1) DeleteResource(ResourceURI *url.URL) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3249,15 +2763,6 @@ func (client *ContentDirectory1) DeleteResource(ResourceURI *url.URL) (err error
 	return
 }
 
-// Arguments:
-//
-// * ContainerID:
-//
-// * ObjectID:
-//
-// Return values:
-//
-// * NewID:
 func (client *ContentDirectory1) CreateReference(ContainerID string, ObjectID string) (NewID string, err error) {
 	// Request structure.
 	request := &struct {
@@ -3354,11 +2859,6 @@ func newContentDirectory2ClientsFromGenericClients(genericClients []goupnp.Servi
 	return clients
 }
 
-//
-//
-// Return values:
-//
-// * SearchCaps:
 func (client *ContentDirectory2) GetSearchCapabilities() (SearchCaps string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3385,11 +2885,6 @@ func (client *ContentDirectory2) GetSearchCapabilities() (SearchCaps string, err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * SortCaps:
 func (client *ContentDirectory2) GetSortCapabilities() (SortCaps string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3416,11 +2911,6 @@ func (client *ContentDirectory2) GetSortCapabilities() (SortCaps string, err err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * SortExtensionCaps:
 func (client *ContentDirectory2) GetSortExtensionCapabilities() (SortExtensionCaps string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3447,11 +2937,6 @@ func (client *ContentDirectory2) GetSortExtensionCapabilities() (SortExtensionCa
 	return
 }
 
-//
-//
-// Return values:
-//
-// * FeatureList:
 func (client *ContentDirectory2) GetFeatureList() (FeatureList string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3478,11 +2963,6 @@ func (client *ContentDirectory2) GetFeatureList() (FeatureList string, err error
 	return
 }
 
-//
-//
-// Return values:
-//
-// * Id:
 func (client *ContentDirectory2) GetSystemUpdateID() (Id uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3509,29 +2989,11 @@ func (client *ContentDirectory2) GetSystemUpdateID() (Id uint32, err error) {
 	return
 }
 
+//
 // Arguments:
 //
-// * ObjectID:
-//
 // * BrowseFlag: allowed values: BrowseMetadata, BrowseDirectChildren
-//
-// * Filter:
-//
-// * StartingIndex:
-//
-// * RequestedCount:
-//
-// * SortCriteria:
-//
-// Return values:
-//
-// * Result:
-//
-// * NumberReturned:
-//
-// * TotalMatches:
-//
-// * UpdateID:
+
 func (client *ContentDirectory2) Browse(ObjectID string, BrowseFlag string, Filter string, StartingIndex uint32, RequestedCount uint32, SortCriteria string) (Result string, NumberReturned uint32, TotalMatches uint32, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -3603,29 +3065,6 @@ func (client *ContentDirectory2) Browse(ObjectID string, BrowseFlag string, Filt
 	return
 }
 
-// Arguments:
-//
-// * ContainerID:
-//
-// * SearchCriteria:
-//
-// * Filter:
-//
-// * StartingIndex:
-//
-// * RequestedCount:
-//
-// * SortCriteria:
-//
-// Return values:
-//
-// * Result:
-//
-// * NumberReturned:
-//
-// * TotalMatches:
-//
-// * UpdateID:
 func (client *ContentDirectory2) Search(ContainerID string, SearchCriteria string, Filter string, StartingIndex uint32, RequestedCount uint32, SortCriteria string) (Result string, NumberReturned uint32, TotalMatches uint32, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -3697,17 +3136,6 @@ func (client *ContentDirectory2) Search(ContainerID string, SearchCriteria strin
 	return
 }
 
-// Arguments:
-//
-// * ContainerID:
-//
-// * Elements:
-//
-// Return values:
-//
-// * ObjectID:
-//
-// * Result:
 func (client *ContentDirectory2) CreateObject(ContainerID string, Elements string) (ObjectID string, Result string, err error) {
 	// Request structure.
 	request := &struct {
@@ -3749,11 +3177,6 @@ func (client *ContentDirectory2) CreateObject(ContainerID string, Elements strin
 	return
 }
 
-// Arguments:
-//
-// * ObjectID:
-//
-//
 func (client *ContentDirectory2) DestroyObject(ObjectID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3780,15 +3203,6 @@ func (client *ContentDirectory2) DestroyObject(ObjectID string) (err error) {
 	return
 }
 
-// Arguments:
-//
-// * ObjectID:
-//
-// * CurrentTagValue:
-//
-// * NewTagValue:
-//
-//
 func (client *ContentDirectory2) UpdateObject(ObjectID string, CurrentTagValue string, NewTagValue string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3825,15 +3239,6 @@ func (client *ContentDirectory2) UpdateObject(ObjectID string, CurrentTagValue s
 	return
 }
 
-// Arguments:
-//
-// * ObjectID:
-//
-// * NewParentID:
-//
-// Return values:
-//
-// * NewObjectID:
 func (client *ContentDirectory2) MoveObject(ObjectID string, NewParentID string) (NewObjectID string, err error) {
 	// Request structure.
 	request := &struct {
@@ -3870,15 +3275,6 @@ func (client *ContentDirectory2) MoveObject(ObjectID string, NewParentID string)
 	return
 }
 
-// Arguments:
-//
-// * SourceURI:
-//
-// * DestinationURI:
-//
-// Return values:
-//
-// * TransferID:
 func (client *ContentDirectory2) ImportResource(SourceURI *url.URL, DestinationURI *url.URL) (TransferID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -3915,15 +3311,6 @@ func (client *ContentDirectory2) ImportResource(SourceURI *url.URL, DestinationU
 	return
 }
 
-// Arguments:
-//
-// * SourceURI:
-//
-// * DestinationURI:
-//
-// Return values:
-//
-// * TransferID:
 func (client *ContentDirectory2) ExportResource(SourceURI *url.URL, DestinationURI *url.URL) (TransferID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -3960,11 +3347,6 @@ func (client *ContentDirectory2) ExportResource(SourceURI *url.URL, DestinationU
 	return
 }
 
-// Arguments:
-//
-// * ResourceURI:
-//
-//
 func (client *ContentDirectory2) DeleteResource(ResourceURI *url.URL) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3991,11 +3373,6 @@ func (client *ContentDirectory2) DeleteResource(ResourceURI *url.URL) (err error
 	return
 }
 
-// Arguments:
-//
-// * TransferID:
-//
-//
 func (client *ContentDirectory2) StopTransferResource(TransferID uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4022,17 +3399,10 @@ func (client *ContentDirectory2) StopTransferResource(TransferID uint32) (err er
 	return
 }
 
-// Arguments:
-//
-// * TransferID:
 //
 // Return values:
 //
 // * TransferStatus: allowed values: COMPLETED, ERROR, IN_PROGRESS, STOPPED
-//
-// * TransferLength:
-//
-// * TransferTotal:
 func (client *ContentDirectory2) GetTransferProgress(TransferID uint32) (TransferStatus string, TransferLength string, TransferTotal string, err error) {
 	// Request structure.
 	request := &struct {
@@ -4074,15 +3444,6 @@ func (client *ContentDirectory2) GetTransferProgress(TransferID uint32) (Transfe
 	return
 }
 
-// Arguments:
-//
-// * ContainerID:
-//
-// * ObjectID:
-//
-// Return values:
-//
-// * NewID:
 func (client *ContentDirectory2) CreateReference(ContainerID string, ObjectID string) (NewID string, err error) {
 	// Request structure.
 	request := &struct {
@@ -4179,11 +3540,6 @@ func newContentDirectory3ClientsFromGenericClients(genericClients []goupnp.Servi
 	return clients
 }
 
-//
-//
-// Return values:
-//
-// * SearchCaps:
 func (client *ContentDirectory3) GetSearchCapabilities() (SearchCaps string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -4210,11 +3566,6 @@ func (client *ContentDirectory3) GetSearchCapabilities() (SearchCaps string, err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * SortCaps:
 func (client *ContentDirectory3) GetSortCapabilities() (SortCaps string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -4241,11 +3592,6 @@ func (client *ContentDirectory3) GetSortCapabilities() (SortCaps string, err err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * SortExtensionCaps:
 func (client *ContentDirectory3) GetSortExtensionCapabilities() (SortExtensionCaps string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -4272,11 +3618,6 @@ func (client *ContentDirectory3) GetSortExtensionCapabilities() (SortExtensionCa
 	return
 }
 
-//
-//
-// Return values:
-//
-// * FeatureList:
 func (client *ContentDirectory3) GetFeatureList() (FeatureList string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -4303,11 +3644,6 @@ func (client *ContentDirectory3) GetFeatureList() (FeatureList string, err error
 	return
 }
 
-//
-//
-// Return values:
-//
-// * Id:
 func (client *ContentDirectory3) GetSystemUpdateID() (Id uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -4334,11 +3670,6 @@ func (client *ContentDirectory3) GetSystemUpdateID() (Id uint32, err error) {
 	return
 }
 
-//
-//
-// Return values:
-//
-// * ResetToken:
 func (client *ContentDirectory3) GetServiceResetToken() (ResetToken string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -4365,29 +3696,11 @@ func (client *ContentDirectory3) GetServiceResetToken() (ResetToken string, err
 	return
 }
 
+//
 // Arguments:
 //
-// * ObjectID:
-//
 // * BrowseFlag: allowed values: BrowseMetadata, BrowseDirectChildren
-//
-// * Filter:
-//
-// * StartingIndex:
-//
-// * RequestedCount:
-//
-// * SortCriteria:
-//
-// Return values:
-//
-// * Result:
-//
-// * NumberReturned:
-//
-// * TotalMatches:
-//
-// * UpdateID:
+
 func (client *ContentDirectory3) Browse(ObjectID string, BrowseFlag string, Filter string, StartingIndex uint32, RequestedCount uint32, SortCriteria string) (Result string, NumberReturned uint32, TotalMatches uint32, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -4459,29 +3772,6 @@ func (client *ContentDirectory3) Browse(ObjectID string, BrowseFlag string, Filt
 	return
 }
 
-// Arguments:
-//
-// * ContainerID:
-//
-// * SearchCriteria:
-//
-// * Filter:
-//
-// * StartingIndex:
-//
-// * RequestedCount:
-//
-// * SortCriteria:
-//
-// Return values:
-//
-// * Result:
-//
-// * NumberReturned:
-//
-// * TotalMatches:
-//
-// * UpdateID:
 func (client *ContentDirectory3) Search(ContainerID string, SearchCriteria string, Filter string, StartingIndex uint32, RequestedCount uint32, SortCriteria string) (Result string, NumberReturned uint32, TotalMatches uint32, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -4553,17 +3843,6 @@ func (client *ContentDirectory3) Search(ContainerID string, SearchCriteria strin
 	return
 }
 
-// Arguments:
-//
-// * ContainerID:
-//
-// * Elements:
-//
-// Return values:
-//
-// * ObjectID:
-//
-// * Result:
 func (client *ContentDirectory3) CreateObject(ContainerID string, Elements string) (ObjectID string, Result string, err error) {
 	// Request structure.
 	request := &struct {
@@ -4605,11 +3884,6 @@ func (client *ContentDirectory3) CreateObject(ContainerID string, Elements strin
 	return
 }
 
-// Arguments:
-//
-// * ObjectID:
-//
-//
 func (client *ContentDirectory3) DestroyObject(ObjectID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4636,15 +3910,6 @@ func (client *ContentDirectory3) DestroyObject(ObjectID string) (err error) {
 	return
 }
 
-// Arguments:
-//
-// * ObjectID:
-//
-// * CurrentTagValue:
-//
-// * NewTagValue:
-//
-//
 func (client *ContentDirectory3) UpdateObject(ObjectID string, CurrentTagValue string, NewTagValue string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4681,15 +3946,6 @@ func (client *ContentDirectory3) UpdateObject(ObjectID string, CurrentTagValue s
 	return
 }
 
-// Arguments:
-//
-// * ObjectID:
-//
-// * NewParentID:
-//
-// Return values:
-//
-// * NewObjectID:
 func (client *ContentDirectory3) MoveObject(ObjectID string, NewParentID string) (NewObjectID string, err error) {
 	// Request structure.
 	request := &struct {
@@ -4726,15 +3982,6 @@ func (client *ContentDirectory3) MoveObject(ObjectID string, NewParentID string)
 	return
 }
 
-// Arguments:
-//
-// * SourceURI:
-//
-// * DestinationURI:
-//
-// Return values:
-//
-// * TransferID:
 func (client *ContentDirectory3) ImportResource(SourceURI *url.URL, DestinationURI *url.URL) (TransferID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -4771,15 +4018,6 @@ func (client *ContentDirectory3) ImportResource(SourceURI *url.URL, DestinationU
 	return
 }
 
-// Arguments:
-//
-// * SourceURI:
-//
-// * DestinationURI:
-//
-// Return values:
-//
-// * TransferID:
 func (client *ContentDirectory3) ExportResource(SourceURI *url.URL, DestinationURI *url.URL) (TransferID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -4816,11 +4054,6 @@ func (client *ContentDirectory3) ExportResource(SourceURI *url.URL, DestinationU
 	return
 }
 
-// Arguments:
-//
-// * ResourceURI:
-//
-//
 func (client *ContentDirectory3) DeleteResource(ResourceURI *url.URL) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4847,11 +4080,6 @@ func (client *ContentDirectory3) DeleteResource(ResourceURI *url.URL) (err error
 	return
 }
 
-// Arguments:
-//
-// * TransferID:
-//
-//
 func (client *ContentDirectory3) StopTransferResource(TransferID uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4878,17 +4106,10 @@ func (client *ContentDirectory3) StopTransferResource(TransferID uint32) (err er
 	return
 }
 
-// Arguments:
-//
-// * TransferID:
 //
 // Return values:
 //
 // * TransferStatus: allowed values: COMPLETED, ERROR, IN_PROGRESS, STOPPED
-//
-// * TransferLength:
-//
-// * TransferTotal:
 func (client *ContentDirectory3) GetTransferProgress(TransferID uint32) (TransferStatus string, TransferLength string, TransferTotal string, err error) {
 	// Request structure.
 	request := &struct {
@@ -4930,15 +4151,6 @@ func (client *ContentDirectory3) GetTransferProgress(TransferID uint32) (Transfe
 	return
 }
 
-// Arguments:
-//
-// * ContainerID:
-//
-// * ObjectID:
-//
-// Return values:
-//
-// * NewID:
 func (client *ContentDirectory3) CreateReference(ContainerID string, ObjectID string) (NewID string, err error) {
 	// Request structure.
 	request := &struct {
@@ -4975,19 +4187,6 @@ func (client *ContentDirectory3) CreateReference(ContainerID string, ObjectID st
 	return
 }
 
-// Arguments:
-//
-// * ContainerID:
-//
-// * CDSView:
-//
-// * QueryRequest:
-//
-// Return values:
-//
-// * QueryResult:
-//
-// * UpdateID:
 func (client *ContentDirectory3) FreeFormQuery(ContainerID string, CDSView uint32, QueryRequest string) (QueryResult string, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -5034,11 +4233,6 @@ func (client *ContentDirectory3) FreeFormQuery(ContainerID string, CDSView uint3
 	return
 }
 
-//
-//
-// Return values:
-//
-// * FFQCapabilities:
 func (client *ContentDirectory3) GetFreeFormQueryCapabilities() (FFQCapabilities string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5125,13 +4319,6 @@ func newRenderingControl1ClientsFromGenericClients(genericClients []goupnp.Servi
 	return clients
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// Return values:
-//
-// * CurrentPresetNameList:
 func (client *RenderingControl1) ListPresets(InstanceID uint32) (CurrentPresetNameList string, err error) {
 	// Request structure.
 	request := &struct {
@@ -5163,13 +4350,11 @@ func (client *RenderingControl1) ListPresets(InstanceID uint32) (CurrentPresetNa
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * PresetName: allowed values: FactoryDefaults
-//
-//
+
 func (client *RenderingControl1) SelectPreset(InstanceID uint32, PresetName string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5201,9 +4386,6 @@ func (client *RenderingControl1) SelectPreset(InstanceID uint32, PresetName stri
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -5239,13 +4421,11 @@ func (client *RenderingControl1) GetBrightness(InstanceID uint32) (CurrentBright
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredBrightness: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl1) SetBrightness(InstanceID uint32, DesiredBrightness uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5277,9 +4457,6 @@ func (client *RenderingControl1) SetBrightness(InstanceID uint32, DesiredBrightn
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -5315,13 +4492,11 @@ func (client *RenderingControl1) GetContrast(InstanceID uint32) (CurrentContrast
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredContrast: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl1) SetContrast(InstanceID uint32, DesiredContrast uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5353,9 +4528,6 @@ func (client *RenderingControl1) SetContrast(InstanceID uint32, DesiredContrast
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -5391,13 +4563,11 @@ func (client *RenderingControl1) GetSharpness(InstanceID uint32) (CurrentSharpne
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredSharpness: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl1) SetSharpness(InstanceID uint32, DesiredSharpness uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5429,13 +4599,6 @@ func (client *RenderingControl1) SetSharpness(InstanceID uint32, DesiredSharpnes
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// Return values:
-//
-// * CurrentRedVideoGain:
 func (client *RenderingControl1) GetRedVideoGain(InstanceID uint32) (CurrentRedVideoGain uint16, err error) {
 	// Request structure.
 	request := &struct {
@@ -5467,13 +4630,6 @@ func (client *RenderingControl1) GetRedVideoGain(InstanceID uint32) (CurrentRedV
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// * DesiredRedVideoGain:
-//
-//
 func (client *RenderingControl1) SetRedVideoGain(InstanceID uint32, DesiredRedVideoGain uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5505,9 +4661,6 @@ func (client *RenderingControl1) SetRedVideoGain(InstanceID uint32, DesiredRedVi
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -5543,13 +4696,11 @@ func (client *RenderingControl1) GetGreenVideoGain(InstanceID uint32) (CurrentGr
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredGreenVideoGain: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl1) SetGreenVideoGain(InstanceID uint32, DesiredGreenVideoGain uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5581,9 +4732,6 @@ func (client *RenderingControl1) SetGreenVideoGain(InstanceID uint32, DesiredGre
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -5619,13 +4767,11 @@ func (client *RenderingControl1) GetBlueVideoGain(InstanceID uint32) (CurrentBlu
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredBlueVideoGain: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl1) SetBlueVideoGain(InstanceID uint32, DesiredBlueVideoGain uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5657,9 +4803,6 @@ func (client *RenderingControl1) SetBlueVideoGain(InstanceID uint32, DesiredBlue
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -5695,13 +4838,11 @@ func (client *RenderingControl1) GetRedVideoBlackLevel(InstanceID uint32) (Curre
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredRedVideoBlackLevel: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl1) SetRedVideoBlackLevel(InstanceID uint32, DesiredRedVideoBlackLevel uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5733,9 +4874,6 @@ func (client *RenderingControl1) SetRedVideoBlackLevel(InstanceID uint32, Desire
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -5771,13 +4909,11 @@ func (client *RenderingControl1) GetGreenVideoBlackLevel(InstanceID uint32) (Cur
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredGreenVideoBlackLevel: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl1) SetGreenVideoBlackLevel(InstanceID uint32, DesiredGreenVideoBlackLevel uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5809,9 +4945,6 @@ func (client *RenderingControl1) SetGreenVideoBlackLevel(InstanceID uint32, Desi
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -5847,13 +4980,11 @@ func (client *RenderingControl1) GetBlueVideoBlackLevel(InstanceID uint32) (Curr
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredBlueVideoBlackLevel: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl1) SetBlueVideoBlackLevel(InstanceID uint32, DesiredBlueVideoBlackLevel uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5885,9 +5016,6 @@ func (client *RenderingControl1) SetBlueVideoBlackLevel(InstanceID uint32, Desir
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -5923,13 +5051,11 @@ func (client *RenderingControl1) GetColorTemperature(InstanceID uint32) (Current
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredColorTemperature: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl1) SetColorTemperature(InstanceID uint32, DesiredColorTemperature uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5961,9 +5087,6 @@ func (client *RenderingControl1) SetColorTemperature(InstanceID uint32, DesiredC
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -5999,13 +5122,11 @@ func (client *RenderingControl1) GetHorizontalKeystone(InstanceID uint32) (Curre
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredHorizontalKeystone: allowed value range: step=1
-//
-//
+
 func (client *RenderingControl1) SetHorizontalKeystone(InstanceID uint32, DesiredHorizontalKeystone int16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -6037,9 +5158,6 @@ func (client *RenderingControl1) SetHorizontalKeystone(InstanceID uint32, Desire
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -6075,13 +5193,11 @@ func (client *RenderingControl1) GetVerticalKeystone(InstanceID uint32) (Current
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredVerticalKeystone: allowed value range: step=1
-//
-//
+
 func (client *RenderingControl1) SetVerticalKeystone(InstanceID uint32, DesiredVerticalKeystone int16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -6113,15 +5229,11 @@ func (client *RenderingControl1) SetVerticalKeystone(InstanceID uint32, DesiredV
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// Return values:
-//
-// * CurrentMute:
+
 func (client *RenderingControl1) GetMute(InstanceID uint32, Channel string) (CurrentMute bool, err error) {
 	// Request structure.
 	request := &struct {
@@ -6158,15 +5270,11 @@ func (client *RenderingControl1) GetMute(InstanceID uint32, Channel string) (Cur
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// * DesiredMute:
-//
-//
+
 func (client *RenderingControl1) SetMute(InstanceID uint32, Channel string, DesiredMute bool) (err error) {
 	// Request structure.
 	request := &struct {
@@ -6203,11 +5311,11 @@ func (client *RenderingControl1) SetMute(InstanceID uint32, Channel string, Desi
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
+
 //
 // Return values:
 //
@@ -6248,15 +5356,13 @@ func (client *RenderingControl1) GetVolume(InstanceID uint32, Channel string) (C
 	return
 }
 
-// Arguments:
 //
-// * InstanceID:
+// Arguments:
 //
 // * Channel: allowed values: Master
 //
 // * DesiredVolume: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl1) SetVolume(InstanceID uint32, Channel string, DesiredVolume uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -6293,15 +5399,11 @@ func (client *RenderingControl1) SetVolume(InstanceID uint32, Channel string, De
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// Return values:
-//
-// * CurrentVolume:
+
 func (client *RenderingControl1) GetVolumeDB(InstanceID uint32, Channel string) (CurrentVolume int16, err error) {
 	// Request structure.
 	request := &struct {
@@ -6338,15 +5440,11 @@ func (client *RenderingControl1) GetVolumeDB(InstanceID uint32, Channel string)
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// * DesiredVolume:
-//
-//
+
 func (client *RenderingControl1) SetVolumeDB(InstanceID uint32, Channel string, DesiredVolume int16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -6383,17 +5481,11 @@ func (client *RenderingControl1) SetVolumeDB(InstanceID uint32, Channel string,
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// Return values:
-//
-// * MinValue:
-//
-// * MaxValue:
+
 func (client *RenderingControl1) GetVolumeDBRange(InstanceID uint32, Channel string) (MinValue int16, MaxValue int16, err error) {
 	// Request structure.
 	request := &struct {
@@ -6435,15 +5527,11 @@ func (client *RenderingControl1) GetVolumeDBRange(InstanceID uint32, Channel str
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// Return values:
-//
-// * CurrentLoudness:
+
 func (client *RenderingControl1) GetLoudness(InstanceID uint32, Channel string) (CurrentLoudness bool, err error) {
 	// Request structure.
 	request := &struct {
@@ -6480,15 +5568,11 @@ func (client *RenderingControl1) GetLoudness(InstanceID uint32, Channel string)
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// * DesiredLoudness:
-//
-//
+
 func (client *RenderingControl1) SetLoudness(InstanceID uint32, Channel string, DesiredLoudness bool) (err error) {
 	// Request structure.
 	request := &struct {
@@ -6585,13 +5669,6 @@ func newRenderingControl2ClientsFromGenericClients(genericClients []goupnp.Servi
 	return clients
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// Return values:
-//
-// * CurrentPresetNameList:
 func (client *RenderingControl2) ListPresets(InstanceID uint32) (CurrentPresetNameList string, err error) {
 	// Request structure.
 	request := &struct {
@@ -6623,13 +5700,11 @@ func (client *RenderingControl2) ListPresets(InstanceID uint32) (CurrentPresetNa
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * PresetName: allowed values: FactoryDefaults
-//
-//
+
 func (client *RenderingControl2) SelectPreset(InstanceID uint32, PresetName string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -6661,9 +5736,6 @@ func (client *RenderingControl2) SelectPreset(InstanceID uint32, PresetName stri
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -6699,13 +5771,11 @@ func (client *RenderingControl2) GetBrightness(InstanceID uint32) (CurrentBright
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredBrightness: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl2) SetBrightness(InstanceID uint32, DesiredBrightness uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -6737,9 +5807,6 @@ func (client *RenderingControl2) SetBrightness(InstanceID uint32, DesiredBrightn
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -6775,13 +5842,11 @@ func (client *RenderingControl2) GetContrast(InstanceID uint32) (CurrentContrast
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredContrast: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl2) SetContrast(InstanceID uint32, DesiredContrast uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -6813,9 +5878,6 @@ func (client *RenderingControl2) SetContrast(InstanceID uint32, DesiredContrast
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -6851,13 +5913,11 @@ func (client *RenderingControl2) GetSharpness(InstanceID uint32) (CurrentSharpne
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredSharpness: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl2) SetSharpness(InstanceID uint32, DesiredSharpness uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -6889,9 +5949,6 @@ func (client *RenderingControl2) SetSharpness(InstanceID uint32, DesiredSharpnes
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -6927,13 +5984,11 @@ func (client *RenderingControl2) GetRedVideoGain(InstanceID uint32) (CurrentRedV
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredRedVideoGain: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl2) SetRedVideoGain(InstanceID uint32, DesiredRedVideoGain uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -6965,9 +6020,6 @@ func (client *RenderingControl2) SetRedVideoGain(InstanceID uint32, DesiredRedVi
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -7003,13 +6055,11 @@ func (client *RenderingControl2) GetGreenVideoGain(InstanceID uint32) (CurrentGr
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredGreenVideoGain: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl2) SetGreenVideoGain(InstanceID uint32, DesiredGreenVideoGain uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -7041,9 +6091,6 @@ func (client *RenderingControl2) SetGreenVideoGain(InstanceID uint32, DesiredGre
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -7079,13 +6126,11 @@ func (client *RenderingControl2) GetBlueVideoGain(InstanceID uint32) (CurrentBlu
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredBlueVideoGain: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl2) SetBlueVideoGain(InstanceID uint32, DesiredBlueVideoGain uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -7117,9 +6162,6 @@ func (client *RenderingControl2) SetBlueVideoGain(InstanceID uint32, DesiredBlue
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -7155,13 +6197,11 @@ func (client *RenderingControl2) GetRedVideoBlackLevel(InstanceID uint32) (Curre
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredRedVideoBlackLevel: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl2) SetRedVideoBlackLevel(InstanceID uint32, DesiredRedVideoBlackLevel uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -7193,9 +6233,6 @@ func (client *RenderingControl2) SetRedVideoBlackLevel(InstanceID uint32, Desire
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -7231,13 +6268,11 @@ func (client *RenderingControl2) GetGreenVideoBlackLevel(InstanceID uint32) (Cur
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredGreenVideoBlackLevel: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl2) SetGreenVideoBlackLevel(InstanceID uint32, DesiredGreenVideoBlackLevel uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -7269,9 +6304,6 @@ func (client *RenderingControl2) SetGreenVideoBlackLevel(InstanceID uint32, Desi
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -7307,13 +6339,11 @@ func (client *RenderingControl2) GetBlueVideoBlackLevel(InstanceID uint32) (Curr
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredBlueVideoBlackLevel: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl2) SetBlueVideoBlackLevel(InstanceID uint32, DesiredBlueVideoBlackLevel uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -7345,9 +6375,6 @@ func (client *RenderingControl2) SetBlueVideoBlackLevel(InstanceID uint32, Desir
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -7383,13 +6410,11 @@ func (client *RenderingControl2) GetColorTemperature(InstanceID uint32) (Current
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredColorTemperature: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl2) SetColorTemperature(InstanceID uint32, DesiredColorTemperature uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -7421,9 +6446,6 @@ func (client *RenderingControl2) SetColorTemperature(InstanceID uint32, DesiredC
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -7459,13 +6481,11 @@ func (client *RenderingControl2) GetHorizontalKeystone(InstanceID uint32) (Curre
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredHorizontalKeystone: allowed value range: step=1
-//
-//
+
 func (client *RenderingControl2) SetHorizontalKeystone(InstanceID uint32, DesiredHorizontalKeystone int16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -7497,9 +6517,6 @@ func (client *RenderingControl2) SetHorizontalKeystone(InstanceID uint32, Desire
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
 //
 // Return values:
 //
@@ -7535,13 +6552,11 @@ func (client *RenderingControl2) GetVerticalKeystone(InstanceID uint32) (Current
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * DesiredVerticalKeystone: allowed value range: step=1
-//
-//
+
 func (client *RenderingControl2) SetVerticalKeystone(InstanceID uint32, DesiredVerticalKeystone int16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -7573,15 +6588,11 @@ func (client *RenderingControl2) SetVerticalKeystone(InstanceID uint32, DesiredV
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// Return values:
-//
-// * CurrentMute:
+
 func (client *RenderingControl2) GetMute(InstanceID uint32, Channel string) (CurrentMute bool, err error) {
 	// Request structure.
 	request := &struct {
@@ -7618,15 +6629,11 @@ func (client *RenderingControl2) GetMute(InstanceID uint32, Channel string) (Cur
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// * DesiredMute:
-//
-//
+
 func (client *RenderingControl2) SetMute(InstanceID uint32, Channel string, DesiredMute bool) (err error) {
 	// Request structure.
 	request := &struct {
@@ -7663,11 +6670,11 @@ func (client *RenderingControl2) SetMute(InstanceID uint32, Channel string, Desi
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
+
 //
 // Return values:
 //
@@ -7708,15 +6715,13 @@ func (client *RenderingControl2) GetVolume(InstanceID uint32, Channel string) (C
 	return
 }
 
-// Arguments:
 //
-// * InstanceID:
+// Arguments:
 //
 // * Channel: allowed values: Master
 //
 // * DesiredVolume: allowed value range: minimum=0, step=1
-//
-//
+
 func (client *RenderingControl2) SetVolume(InstanceID uint32, Channel string, DesiredVolume uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -7753,15 +6758,11 @@ func (client *RenderingControl2) SetVolume(InstanceID uint32, Channel string, De
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// Return values:
-//
-// * CurrentVolume:
+
 func (client *RenderingControl2) GetVolumeDB(InstanceID uint32, Channel string) (CurrentVolume int16, err error) {
 	// Request structure.
 	request := &struct {
@@ -7798,15 +6799,11 @@ func (client *RenderingControl2) GetVolumeDB(InstanceID uint32, Channel string)
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// * DesiredVolume:
-//
-//
+
 func (client *RenderingControl2) SetVolumeDB(InstanceID uint32, Channel string, DesiredVolume int16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -7843,17 +6840,11 @@ func (client *RenderingControl2) SetVolumeDB(InstanceID uint32, Channel string,
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// Return values:
-//
-// * MinValue:
-//
-// * MaxValue:
+
 func (client *RenderingControl2) GetVolumeDBRange(InstanceID uint32, Channel string) (MinValue int16, MaxValue int16, err error) {
 	// Request structure.
 	request := &struct {
@@ -7895,15 +6886,11 @@ func (client *RenderingControl2) GetVolumeDBRange(InstanceID uint32, Channel str
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// Return values:
-//
-// * CurrentLoudness:
+
 func (client *RenderingControl2) GetLoudness(InstanceID uint32, Channel string) (CurrentLoudness bool, err error) {
 	// Request structure.
 	request := &struct {
@@ -7940,15 +6927,11 @@ func (client *RenderingControl2) GetLoudness(InstanceID uint32, Channel string)
 	return
 }
 
+//
 // Arguments:
 //
-// * InstanceID:
-//
 // * Channel: allowed values: Master
-//
-// * DesiredLoudness:
-//
-//
+
 func (client *RenderingControl2) SetLoudness(InstanceID uint32, Channel string, DesiredLoudness bool) (err error) {
 	// Request structure.
 	request := &struct {
@@ -7985,15 +6968,6 @@ func (client *RenderingControl2) SetLoudness(InstanceID uint32, Channel string,
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// * StateVariableList:
-//
-// Return values:
-//
-// * StateVariableValuePairs:
 func (client *RenderingControl2) GetStateVariables(InstanceID uint32, StateVariableList string) (StateVariableValuePairs string, err error) {
 	// Request structure.
 	request := &struct {
@@ -8030,21 +7004,6 @@ func (client *RenderingControl2) GetStateVariables(InstanceID uint32, StateVaria
 	return
 }
 
-// Arguments:
-//
-// * InstanceID:
-//
-// * RenderingControlUDN:
-//
-// * ServiceType:
-//
-// * ServiceId:
-//
-// * StateVariableValuePairs:
-//
-// Return values:
-//
-// * StateVariableList:
 func (client *RenderingControl2) SetStateVariables(InstanceID uint32, RenderingControlUDN string, ServiceType string, ServiceId string, StateVariableValuePairs string) (StateVariableList string, err error) {
 	// Request structure.
 	request := &struct {
@@ -8156,13 +7115,6 @@ func newScheduledRecording1ClientsFromGenericClients(genericClients []goupnp.Ser
 	return clients
 }
 
-//
-//
-// Return values:
-//
-// * SortCaps:
-//
-// * SortLevelCap:
 func (client *ScheduledRecording1) GetSortCapabilities() (SortCaps string, SortLevelCap uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -8194,13 +7146,11 @@ func (client *ScheduledRecording1) GetSortCapabilities() (SortCaps string, SortL
 	return
 }
 
+//
 // Arguments:
 //
 // * DataTypeID: allowed values: A_ARG_TYPE_RecordSchedule, A_ARG_TYPE_RecordTask, A_ARG_TYPE_RecordScheduleParts
-//
-// Return values:
-//
-// * PropertyList:
+
 func (client *ScheduledRecording1) GetPropertyList(DataTypeID string) (PropertyList string, err error) {
 	// Request structure.
 	request := &struct {
@@ -8232,15 +7182,11 @@ func (client *ScheduledRecording1) GetPropertyList(DataTypeID string) (PropertyL
 	return
 }
 
+//
 // Arguments:
 //
 // * DataTypeID: allowed values: A_ARG_TYPE_RecordSchedule, A_ARG_TYPE_RecordTask, A_ARG_TYPE_RecordScheduleParts
-//
-// * Filter:
-//
-// Return values:
-//
-// * PropertyInfo:
+
 func (client *ScheduledRecording1) GetAllowedValues(DataTypeID string, Filter string) (PropertyInfo string, err error) {
 	// Request structure.
 	request := &struct {
@@ -8277,11 +7223,6 @@ func (client *ScheduledRecording1) GetAllowedValues(DataTypeID string, Filter st
 	return
 }
 
-//
-//
-// Return values:
-//
-// * Id:
 func (client *ScheduledRecording1) GetStateUpdateID() (Id uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -8308,25 +7249,6 @@ func (client *ScheduledRecording1) GetStateUpdateID() (Id uint32, err error) {
 	return
 }
 
-// Arguments:
-//
-// * Filter:
-//
-// * StartingIndex:
-//
-// * RequestedCount:
-//
-// * SortCriteria:
-//
-// Return values:
-//
-// * Result:
-//
-// * NumberReturned:
-//
-// * TotalMatches:
-//
-// * UpdateID:
 func (client *ScheduledRecording1) BrowseRecordSchedules(Filter string, StartingIndex uint32, RequestedCount uint32, SortCriteria string) (Result string, NumberReturned uint32, TotalMatches uint32, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -8388,27 +7310,6 @@ func (client *ScheduledRecording1) BrowseRecordSchedules(Filter string, Starting
 	return
 }
 
-// Arguments:
-//
-// * RecordScheduleID:
-//
-// * Filter:
-//
-// * StartingIndex:
-//
-// * RequestedCount:
-//
-// * SortCriteria:
-//
-// Return values:
-//
-// * Result:
-//
-// * NumberReturned:
-//
-// * TotalMatches:
-//
-// * UpdateID:
 func (client *ScheduledRecording1) BrowseRecordTasks(RecordScheduleID string, Filter string, StartingIndex uint32, RequestedCount uint32, SortCriteria string) (Result string, NumberReturned uint32, TotalMatches uint32, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -8475,17 +7376,6 @@ func (client *ScheduledRecording1) BrowseRecordTasks(RecordScheduleID string, Fi
 	return
 }
 
-// Arguments:
-//
-// * Elements:
-//
-// Return values:
-//
-// * RecordScheduleID:
-//
-// * Result:
-//
-// * UpdateID:
 func (client *ScheduledRecording1) CreateRecordSchedule(Elements string) (RecordScheduleID string, Result string, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -8527,11 +7417,6 @@ func (client *ScheduledRecording1) CreateRecordSchedule(Elements string) (Record
 	return
 }
 
-// Arguments:
-//
-// * RecordScheduleID:
-//
-//
 func (client *ScheduledRecording1) DeleteRecordSchedule(RecordScheduleID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -8558,17 +7443,6 @@ func (client *ScheduledRecording1) DeleteRecordSchedule(RecordScheduleID string)
 	return
 }
 
-// Arguments:
-//
-// * RecordScheduleID:
-//
-// * Filter:
-//
-// Return values:
-//
-// * Result:
-//
-// * UpdateID:
 func (client *ScheduledRecording1) GetRecordSchedule(RecordScheduleID string, Filter string) (Result string, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -8610,11 +7484,6 @@ func (client *ScheduledRecording1) GetRecordSchedule(RecordScheduleID string, Fi
 	return
 }
 
-// Arguments:
-//
-// * RecordScheduleID:
-//
-//
 func (client *ScheduledRecording1) EnableRecordSchedule(RecordScheduleID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -8641,11 +7510,6 @@ func (client *ScheduledRecording1) EnableRecordSchedule(RecordScheduleID string)
 	return
 }
 
-// Arguments:
-//
-// * RecordScheduleID:
-//
-//
 func (client *ScheduledRecording1) DisableRecordSchedule(RecordScheduleID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -8672,11 +7536,6 @@ func (client *ScheduledRecording1) DisableRecordSchedule(RecordScheduleID string
 	return
 }
 
-// Arguments:
-//
-// * RecordTaskID:
-//
-//
 func (client *ScheduledRecording1) DeleteRecordTask(RecordTaskID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -8703,17 +7562,6 @@ func (client *ScheduledRecording1) DeleteRecordTask(RecordTaskID string) (err er
 	return
 }
 
-// Arguments:
-//
-// * RecordTaskID:
-//
-// * Filter:
-//
-// Return values:
-//
-// * Result:
-//
-// * UpdateID:
 func (client *ScheduledRecording1) GetRecordTask(RecordTaskID string, Filter string) (Result string, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -8755,11 +7603,6 @@ func (client *ScheduledRecording1) GetRecordTask(RecordTaskID string, Filter str
 	return
 }
 
-// Arguments:
-//
-// * RecordTaskID:
-//
-//
 func (client *ScheduledRecording1) EnableRecordTask(RecordTaskID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -8786,11 +7629,6 @@ func (client *ScheduledRecording1) EnableRecordTask(RecordTaskID string) (err er
 	return
 }
 
-// Arguments:
-//
-// * RecordTaskID:
-//
-//
 func (client *ScheduledRecording1) DisableRecordTask(RecordTaskID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -8817,11 +7655,6 @@ func (client *ScheduledRecording1) DisableRecordTask(RecordTaskID string) (err e
 	return
 }
 
-// Arguments:
-//
-// * RecordTaskID:
-//
-//
 func (client *ScheduledRecording1) ResetRecordTask(RecordTaskID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -8848,15 +7681,6 @@ func (client *ScheduledRecording1) ResetRecordTask(RecordTaskID string) (err err
 	return
 }
 
-// Arguments:
-//
-// * RecordScheduleID:
-//
-// Return values:
-//
-// * RecordScheduleConflictIDList:
-//
-// * UpdateID:
 func (client *ScheduledRecording1) GetRecordScheduleConflicts(RecordScheduleID string) (RecordScheduleConflictIDList string, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -8893,15 +7717,6 @@ func (client *ScheduledRecording1) GetRecordScheduleConflicts(RecordScheduleID s
 	return
 }
 
-// Arguments:
-//
-// * RecordTaskID:
-//
-// Return values:
-//
-// * RecordTaskConflictIDList:
-//
-// * UpdateID:
 func (client *ScheduledRecording1) GetRecordTaskConflicts(RecordTaskID string) (RecordTaskConflictIDList string, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -8998,13 +7813,6 @@ func newScheduledRecording2ClientsFromGenericClients(genericClients []goupnp.Ser
 	return clients
 }
 
-//
-//
-// Return values:
-//
-// * SortCaps:
-//
-// * SortLevelCap:
 func (client *ScheduledRecording2) GetSortCapabilities() (SortCaps string, SortLevelCap uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -9036,13 +7844,11 @@ func (client *ScheduledRecording2) GetSortCapabilities() (SortCaps string, SortL
 	return
 }
 
+//
 // Arguments:
 //
 // * DataTypeID: allowed values: A_ARG_TYPE_RecordSchedule, A_ARG_TYPE_RecordTask, A_ARG_TYPE_RecordScheduleParts
-//
-// Return values:
-//
-// * PropertyList:
+
 func (client *ScheduledRecording2) GetPropertyList(DataTypeID string) (PropertyList string, err error) {
 	// Request structure.
 	request := &struct {
@@ -9074,15 +7880,11 @@ func (client *ScheduledRecording2) GetPropertyList(DataTypeID string) (PropertyL
 	return
 }
 
+//
 // Arguments:
 //
 // * DataTypeID: allowed values: A_ARG_TYPE_RecordSchedule, A_ARG_TYPE_RecordTask, A_ARG_TYPE_RecordScheduleParts
-//
-// * Filter:
-//
-// Return values:
-//
-// * PropertyInfo:
+
 func (client *ScheduledRecording2) GetAllowedValues(DataTypeID string, Filter string) (PropertyInfo string, err error) {
 	// Request structure.
 	request := &struct {
@@ -9119,11 +7921,6 @@ func (client *ScheduledRecording2) GetAllowedValues(DataTypeID string, Filter st
 	return
 }
 
-//
-//
-// Return values:
-//
-// * Id:
 func (client *ScheduledRecording2) GetStateUpdateID() (Id uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -9150,25 +7947,6 @@ func (client *ScheduledRecording2) GetStateUpdateID() (Id uint32, err error) {
 	return
 }
 
-// Arguments:
-//
-// * Filter:
-//
-// * StartingIndex:
-//
-// * RequestedCount:
-//
-// * SortCriteria:
-//
-// Return values:
-//
-// * Result:
-//
-// * NumberReturned:
-//
-// * TotalMatches:
-//
-// * UpdateID:
 func (client *ScheduledRecording2) BrowseRecordSchedules(Filter string, StartingIndex uint32, RequestedCount uint32, SortCriteria string) (Result string, NumberReturned uint32, TotalMatches uint32, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -9230,27 +8008,6 @@ func (client *ScheduledRecording2) BrowseRecordSchedules(Filter string, Starting
 	return
 }
 
-// Arguments:
-//
-// * RecordScheduleID:
-//
-// * Filter:
-//
-// * StartingIndex:
-//
-// * RequestedCount:
-//
-// * SortCriteria:
-//
-// Return values:
-//
-// * Result:
-//
-// * NumberReturned:
-//
-// * TotalMatches:
-//
-// * UpdateID:
 func (client *ScheduledRecording2) BrowseRecordTasks(RecordScheduleID string, Filter string, StartingIndex uint32, RequestedCount uint32, SortCriteria string) (Result string, NumberReturned uint32, TotalMatches uint32, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -9317,17 +8074,6 @@ func (client *ScheduledRecording2) BrowseRecordTasks(RecordScheduleID string, Fi
 	return
 }
 
-// Arguments:
-//
-// * Elements:
-//
-// Return values:
-//
-// * RecordScheduleID:
-//
-// * Result:
-//
-// * UpdateID:
 func (client *ScheduledRecording2) CreateRecordSchedule(Elements string) (RecordScheduleID string, Result string, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -9369,11 +8115,6 @@ func (client *ScheduledRecording2) CreateRecordSchedule(Elements string) (Record
 	return
 }
 
-// Arguments:
-//
-// * RecordScheduleID:
-//
-//
 func (client *ScheduledRecording2) DeleteRecordSchedule(RecordScheduleID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -9400,17 +8141,6 @@ func (client *ScheduledRecording2) DeleteRecordSchedule(RecordScheduleID string)
 	return
 }
 
-// Arguments:
-//
-// * RecordScheduleID:
-//
-// * Filter:
-//
-// Return values:
-//
-// * Result:
-//
-// * UpdateID:
 func (client *ScheduledRecording2) GetRecordSchedule(RecordScheduleID string, Filter string) (Result string, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -9452,11 +8182,6 @@ func (client *ScheduledRecording2) GetRecordSchedule(RecordScheduleID string, Fi
 	return
 }
 
-// Arguments:
-//
-// * RecordScheduleID:
-//
-//
 func (client *ScheduledRecording2) EnableRecordSchedule(RecordScheduleID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -9483,11 +8208,6 @@ func (client *ScheduledRecording2) EnableRecordSchedule(RecordScheduleID string)
 	return
 }
 
-// Arguments:
-//
-// * RecordScheduleID:
-//
-//
 func (client *ScheduledRecording2) DisableRecordSchedule(RecordScheduleID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -9514,11 +8234,6 @@ func (client *ScheduledRecording2) DisableRecordSchedule(RecordScheduleID string
 	return
 }
 
-// Arguments:
-//
-// * RecordTaskID:
-//
-//
 func (client *ScheduledRecording2) DeleteRecordTask(RecordTaskID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -9545,17 +8260,6 @@ func (client *ScheduledRecording2) DeleteRecordTask(RecordTaskID string) (err er
 	return
 }
 
-// Arguments:
-//
-// * RecordTaskID:
-//
-// * Filter:
-//
-// Return values:
-//
-// * Result:
-//
-// * UpdateID:
 func (client *ScheduledRecording2) GetRecordTask(RecordTaskID string, Filter string) (Result string, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -9597,11 +8301,6 @@ func (client *ScheduledRecording2) GetRecordTask(RecordTaskID string, Filter str
 	return
 }
 
-// Arguments:
-//
-// * RecordTaskID:
-//
-//
 func (client *ScheduledRecording2) EnableRecordTask(RecordTaskID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -9628,11 +8327,6 @@ func (client *ScheduledRecording2) EnableRecordTask(RecordTaskID string) (err er
 	return
 }
 
-// Arguments:
-//
-// * RecordTaskID:
-//
-//
 func (client *ScheduledRecording2) DisableRecordTask(RecordTaskID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -9659,11 +8353,6 @@ func (client *ScheduledRecording2) DisableRecordTask(RecordTaskID string) (err e
 	return
 }
 
-// Arguments:
-//
-// * RecordTaskID:
-//
-//
 func (client *ScheduledRecording2) ResetRecordTask(RecordTaskID string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -9690,15 +8379,6 @@ func (client *ScheduledRecording2) ResetRecordTask(RecordTaskID string) (err err
 	return
 }
 
-// Arguments:
-//
-// * RecordScheduleID:
-//
-// Return values:
-//
-// * RecordScheduleConflictIDList:
-//
-// * UpdateID:
 func (client *ScheduledRecording2) GetRecordScheduleConflicts(RecordScheduleID string) (RecordScheduleConflictIDList string, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -9735,15 +8415,6 @@ func (client *ScheduledRecording2) GetRecordScheduleConflicts(RecordScheduleID s
 	return
 }
 
-// Arguments:
-//
-// * RecordTaskID:
-//
-// Return values:
-//
-// * RecordTaskConflictIDList:
-//
-// * UpdateID:
 func (client *ScheduledRecording2) GetRecordTaskConflicts(RecordTaskID string) (RecordTaskConflictIDList string, UpdateID uint32, err error) {
 	// Request structure.
 	request := &struct {
diff --git a/dcps/internetgateway1/internetgateway1.go b/dcps/internetgateway1/internetgateway1.go
index 58383b0..1e0802c 100644
--- a/dcps/internetgateway1/internetgateway1.go
+++ b/dcps/internetgateway1/internetgateway1.go
@@ -98,11 +98,6 @@ func newLANHostConfigManagement1ClientsFromGenericClients(genericClients []goupn
 	return clients
 }
 
-// Arguments:
-//
-// * NewDHCPServerConfigurable:
-//
-//
 func (client *LANHostConfigManagement1) SetDHCPServerConfigurable(NewDHCPServerConfigurable bool) (err error) {
 	// Request structure.
 	request := &struct {
@@ -129,11 +124,6 @@ func (client *LANHostConfigManagement1) SetDHCPServerConfigurable(NewDHCPServerC
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDHCPServerConfigurable:
 func (client *LANHostConfigManagement1) GetDHCPServerConfigurable() (NewDHCPServerConfigurable bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -160,11 +150,6 @@ func (client *LANHostConfigManagement1) GetDHCPServerConfigurable() (NewDHCPServ
 	return
 }
 
-// Arguments:
-//
-// * NewDHCPRelay:
-//
-//
 func (client *LANHostConfigManagement1) SetDHCPRelay(NewDHCPRelay bool) (err error) {
 	// Request structure.
 	request := &struct {
@@ -191,11 +176,6 @@ func (client *LANHostConfigManagement1) SetDHCPRelay(NewDHCPRelay bool) (err err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDHCPRelay:
 func (client *LANHostConfigManagement1) GetDHCPRelay() (NewDHCPRelay bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -222,11 +202,6 @@ func (client *LANHostConfigManagement1) GetDHCPRelay() (NewDHCPRelay bool, err e
 	return
 }
 
-// Arguments:
-//
-// * NewSubnetMask:
-//
-//
 func (client *LANHostConfigManagement1) SetSubnetMask(NewSubnetMask string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -253,11 +228,6 @@ func (client *LANHostConfigManagement1) SetSubnetMask(NewSubnetMask string) (err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewSubnetMask:
 func (client *LANHostConfigManagement1) GetSubnetMask() (NewSubnetMask string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -284,11 +254,6 @@ func (client *LANHostConfigManagement1) GetSubnetMask() (NewSubnetMask string, e
 	return
 }
 
-// Arguments:
-//
-// * NewIPRouters:
-//
-//
 func (client *LANHostConfigManagement1) SetIPRouter(NewIPRouters string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -315,11 +280,6 @@ func (client *LANHostConfigManagement1) SetIPRouter(NewIPRouters string) (err er
 	return
 }
 
-// Arguments:
-//
-// * NewIPRouters:
-//
-//
 func (client *LANHostConfigManagement1) DeleteIPRouter(NewIPRouters string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -346,11 +306,6 @@ func (client *LANHostConfigManagement1) DeleteIPRouter(NewIPRouters string) (err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewIPRouters:
 func (client *LANHostConfigManagement1) GetIPRoutersList() (NewIPRouters string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -377,11 +332,6 @@ func (client *LANHostConfigManagement1) GetIPRoutersList() (NewIPRouters string,
 	return
 }
 
-// Arguments:
-//
-// * NewDomainName:
-//
-//
 func (client *LANHostConfigManagement1) SetDomainName(NewDomainName string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -408,11 +358,6 @@ func (client *LANHostConfigManagement1) SetDomainName(NewDomainName string) (err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDomainName:
 func (client *LANHostConfigManagement1) GetDomainName() (NewDomainName string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -439,13 +384,6 @@ func (client *LANHostConfigManagement1) GetDomainName() (NewDomainName string, e
 	return
 }
 
-// Arguments:
-//
-// * NewMinAddress:
-//
-// * NewMaxAddress:
-//
-//
 func (client *LANHostConfigManagement1) SetAddressRange(NewMinAddress string, NewMaxAddress string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -477,13 +415,6 @@ func (client *LANHostConfigManagement1) SetAddressRange(NewMinAddress string, Ne
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewMinAddress:
-//
-// * NewMaxAddress:
 func (client *LANHostConfigManagement1) GetAddressRange() (NewMinAddress string, NewMaxAddress string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -515,11 +446,6 @@ func (client *LANHostConfigManagement1) GetAddressRange() (NewMinAddress string,
 	return
 }
 
-// Arguments:
-//
-// * NewReservedAddresses:
-//
-//
 func (client *LANHostConfigManagement1) SetReservedAddress(NewReservedAddresses string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -546,11 +472,6 @@ func (client *LANHostConfigManagement1) SetReservedAddress(NewReservedAddresses
 	return
 }
 
-// Arguments:
-//
-// * NewReservedAddresses:
-//
-//
 func (client *LANHostConfigManagement1) DeleteReservedAddress(NewReservedAddresses string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -577,11 +498,6 @@ func (client *LANHostConfigManagement1) DeleteReservedAddress(NewReservedAddress
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewReservedAddresses:
 func (client *LANHostConfigManagement1) GetReservedAddresses() (NewReservedAddresses string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -608,11 +524,6 @@ func (client *LANHostConfigManagement1) GetReservedAddresses() (NewReservedAddre
 	return
 }
 
-// Arguments:
-//
-// * NewDNSServers:
-//
-//
 func (client *LANHostConfigManagement1) SetDNSServer(NewDNSServers string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -639,11 +550,6 @@ func (client *LANHostConfigManagement1) SetDNSServer(NewDNSServers string) (err
 	return
 }
 
-// Arguments:
-//
-// * NewDNSServers:
-//
-//
 func (client *LANHostConfigManagement1) DeleteDNSServer(NewDNSServers string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -670,11 +576,6 @@ func (client *LANHostConfigManagement1) DeleteDNSServer(NewDNSServers string) (e
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDNSServers:
 func (client *LANHostConfigManagement1) GetDNSServers() (NewDNSServers string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -761,11 +662,6 @@ func newLayer3Forwarding1ClientsFromGenericClients(genericClients []goupnp.Servi
 	return clients
 }
 
-// Arguments:
-//
-// * NewDefaultConnectionService:
-//
-//
 func (client *Layer3Forwarding1) SetDefaultConnectionService(NewDefaultConnectionService string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -792,11 +688,6 @@ func (client *Layer3Forwarding1) SetDefaultConnectionService(NewDefaultConnectio
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDefaultConnectionService:
 func (client *Layer3Forwarding1) GetDefaultConnectionService() (NewDefaultConnectionService string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -883,7 +774,6 @@ func newWANCableLinkConfig1ClientsFromGenericClients(genericClients []goupnp.Ser
 	return clients
 }
 
-//
 //
 // Return values:
 //
@@ -921,11 +811,6 @@ func (client *WANCableLinkConfig1) GetCableLinkConfigInfo() (NewCableLinkConfigS
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDownstreamFrequency:
 func (client *WANCableLinkConfig1) GetDownstreamFrequency() (NewDownstreamFrequency uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -952,7 +837,6 @@ func (client *WANCableLinkConfig1) GetDownstreamFrequency() (NewDownstreamFreque
 	return
 }
 
-//
 //
 // Return values:
 //
@@ -983,11 +867,6 @@ func (client *WANCableLinkConfig1) GetDownstreamModulation() (NewDownstreamModul
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewUpstreamFrequency:
 func (client *WANCableLinkConfig1) GetUpstreamFrequency() (NewUpstreamFrequency uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1014,7 +893,6 @@ func (client *WANCableLinkConfig1) GetUpstreamFrequency() (NewUpstreamFrequency
 	return
 }
 
-//
 //
 // Return values:
 //
@@ -1045,11 +923,6 @@ func (client *WANCableLinkConfig1) GetUpstreamModulation() (NewUpstreamModulatio
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewUpstreamChannelID:
 func (client *WANCableLinkConfig1) GetUpstreamChannelID() (NewUpstreamChannelID uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1076,11 +949,6 @@ func (client *WANCableLinkConfig1) GetUpstreamChannelID() (NewUpstreamChannelID
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewUpstreamPowerLevel:
 func (client *WANCableLinkConfig1) GetUpstreamPowerLevel() (NewUpstreamPowerLevel uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1107,11 +975,6 @@ func (client *WANCableLinkConfig1) GetUpstreamPowerLevel() (NewUpstreamPowerLeve
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewBPIEncryptionEnabled:
 func (client *WANCableLinkConfig1) GetBPIEncryptionEnabled() (NewBPIEncryptionEnabled bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1138,11 +1001,6 @@ func (client *WANCableLinkConfig1) GetBPIEncryptionEnabled() (NewBPIEncryptionEn
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewConfigFile:
 func (client *WANCableLinkConfig1) GetConfigFile() (NewConfigFile string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1169,11 +1027,6 @@ func (client *WANCableLinkConfig1) GetConfigFile() (NewConfigFile string, err er
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewTFTPServer:
 func (client *WANCableLinkConfig1) GetTFTPServer() (NewTFTPServer string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1260,11 +1113,6 @@ func newWANCommonInterfaceConfig1ClientsFromGenericClients(genericClients []goup
 	return clients
 }
 
-// Arguments:
-//
-// * NewEnabledForInternet:
-//
-//
 func (client *WANCommonInterfaceConfig1) SetEnabledForInternet(NewEnabledForInternet bool) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1291,11 +1139,6 @@ func (client *WANCommonInterfaceConfig1) SetEnabledForInternet(NewEnabledForInte
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewEnabledForInternet:
 func (client *WANCommonInterfaceConfig1) GetEnabledForInternet() (NewEnabledForInternet bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1322,16 +1165,11 @@ func (client *WANCommonInterfaceConfig1) GetEnabledForInternet() (NewEnabledForI
 	return
 }
 
-//
 //
 // Return values:
 //
 // * NewWANAccessType: allowed values: DSL, POTS, Cable, Ethernet
 //
-// * NewLayer1UpstreamMaxBitRate:
-//
-// * NewLayer1DownstreamMaxBitRate:
-//
 // * NewPhysicalLinkStatus: allowed values: Up, Down
 func (client *WANCommonInterfaceConfig1) GetCommonLinkProperties() (NewWANAccessType string, NewLayer1UpstreamMaxBitRate uint32, NewLayer1DownstreamMaxBitRate uint32, NewPhysicalLinkStatus string, err error) {
 	// Request structure.
@@ -1374,11 +1212,6 @@ func (client *WANCommonInterfaceConfig1) GetCommonLinkProperties() (NewWANAccess
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewWANAccessProvider:
 func (client *WANCommonInterfaceConfig1) GetWANAccessProvider() (NewWANAccessProvider string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1405,7 +1238,6 @@ func (client *WANCommonInterfaceConfig1) GetWANAccessProvider() (NewWANAccessPro
 	return
 }
 
-//
 //
 // Return values:
 //
@@ -1436,11 +1268,6 @@ func (client *WANCommonInterfaceConfig1) GetMaximumActiveConnections() (NewMaxim
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewTotalBytesSent:
 func (client *WANCommonInterfaceConfig1) GetTotalBytesSent() (NewTotalBytesSent uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1467,11 +1294,6 @@ func (client *WANCommonInterfaceConfig1) GetTotalBytesSent() (NewTotalBytesSent
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewTotalBytesReceived:
 func (client *WANCommonInterfaceConfig1) GetTotalBytesReceived() (NewTotalBytesReceived uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1498,11 +1320,6 @@ func (client *WANCommonInterfaceConfig1) GetTotalBytesReceived() (NewTotalBytesR
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewTotalPacketsSent:
 func (client *WANCommonInterfaceConfig1) GetTotalPacketsSent() (NewTotalPacketsSent uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1529,11 +1346,6 @@ func (client *WANCommonInterfaceConfig1) GetTotalPacketsSent() (NewTotalPacketsS
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewTotalPacketsReceived:
 func (client *WANCommonInterfaceConfig1) GetTotalPacketsReceived() (NewTotalPacketsReceived uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1560,15 +1372,6 @@ func (client *WANCommonInterfaceConfig1) GetTotalPacketsReceived() (NewTotalPack
 	return
 }
 
-// Arguments:
-//
-// * NewActiveConnectionIndex:
-//
-// Return values:
-//
-// * NewActiveConnDeviceContainer:
-//
-// * NewActiveConnectionServiceID:
 func (client *WANCommonInterfaceConfig1) GetActiveConnection(NewActiveConnectionIndex uint16) (NewActiveConnDeviceContainer string, NewActiveConnectionServiceID string, err error) {
 	// Request structure.
 	request := &struct {
@@ -1665,11 +1468,6 @@ func newWANDSLLinkConfig1ClientsFromGenericClients(genericClients []goupnp.Servi
 	return clients
 }
 
-// Arguments:
-//
-// * NewLinkType:
-//
-//
 func (client *WANDSLLinkConfig1) SetDSLLinkType(NewLinkType string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1696,12 +1494,9 @@ func (client *WANDSLLinkConfig1) SetDSLLinkType(NewLinkType string) (err error)
 	return
 }
 
-//
 //
 // Return values:
 //
-// * NewLinkType:
-//
 // * NewLinkStatus: allowed values: Up, Down
 func (client *WANDSLLinkConfig1) GetDSLLinkInfo() (NewLinkType string, NewLinkStatus string, err error) {
 	// Request structure.
@@ -1734,11 +1529,6 @@ func (client *WANDSLLinkConfig1) GetDSLLinkInfo() (NewLinkType string, NewLinkSt
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewAutoConfig:
 func (client *WANDSLLinkConfig1) GetAutoConfig() (NewAutoConfig bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1765,11 +1555,6 @@ func (client *WANDSLLinkConfig1) GetAutoConfig() (NewAutoConfig bool, err error)
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewModulationType:
 func (client *WANDSLLinkConfig1) GetModulationType() (NewModulationType string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1796,11 +1581,6 @@ func (client *WANDSLLinkConfig1) GetModulationType() (NewModulationType string,
 	return
 }
 
-// Arguments:
-//
-// * NewDestinationAddress:
-//
-//
 func (client *WANDSLLinkConfig1) SetDestinationAddress(NewDestinationAddress string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1827,11 +1607,6 @@ func (client *WANDSLLinkConfig1) SetDestinationAddress(NewDestinationAddress str
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDestinationAddress:
 func (client *WANDSLLinkConfig1) GetDestinationAddress() (NewDestinationAddress string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1858,11 +1633,6 @@ func (client *WANDSLLinkConfig1) GetDestinationAddress() (NewDestinationAddress
 	return
 }
 
-// Arguments:
-//
-// * NewATMEncapsulation:
-//
-//
 func (client *WANDSLLinkConfig1) SetATMEncapsulation(NewATMEncapsulation string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1889,11 +1659,6 @@ func (client *WANDSLLinkConfig1) SetATMEncapsulation(NewATMEncapsulation string)
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewATMEncapsulation:
 func (client *WANDSLLinkConfig1) GetATMEncapsulation() (NewATMEncapsulation string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1920,11 +1685,6 @@ func (client *WANDSLLinkConfig1) GetATMEncapsulation() (NewATMEncapsulation stri
 	return
 }
 
-// Arguments:
-//
-// * NewFCSPreserved:
-//
-//
 func (client *WANDSLLinkConfig1) SetFCSPreserved(NewFCSPreserved bool) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1951,11 +1711,6 @@ func (client *WANDSLLinkConfig1) SetFCSPreserved(NewFCSPreserved bool) (err erro
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewFCSPreserved:
 func (client *WANDSLLinkConfig1) GetFCSPreserved() (NewFCSPreserved bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2042,7 +1797,6 @@ func newWANEthernetLinkConfig1ClientsFromGenericClients(genericClients []goupnp.
 	return clients
 }
 
-//
 //
 // Return values:
 //
@@ -2133,11 +1887,6 @@ func newWANIPConnection1ClientsFromGenericClients(genericClients []goupnp.Servic
 	return clients
 }
 
-// Arguments:
-//
-// * NewConnectionType:
-//
-//
 func (client *WANIPConnection1) SetConnectionType(NewConnectionType string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2164,12 +1913,9 @@ func (client *WANIPConnection1) SetConnectionType(NewConnectionType string) (err
 	return
 }
 
-//
 //
 // Return values:
 //
-// * NewConnectionType:
-//
 // * NewPossibleConnectionTypes: allowed values: Unconfigured, IP_Routed, IP_Bridged
 func (client *WANIPConnection1) GetConnectionTypeInfo() (NewConnectionType string, NewPossibleConnectionTypes string, err error) {
 	// Request structure.
@@ -2202,9 +1948,6 @@ func (client *WANIPConnection1) GetConnectionTypeInfo() (NewConnectionType strin
 	return
 }
 
-//
-//
-//
 func (client *WANIPConnection1) RequestConnection() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2226,9 +1969,6 @@ func (client *WANIPConnection1) RequestConnection() (err error) {
 	return
 }
 
-//
-//
-//
 func (client *WANIPConnection1) RequestTermination() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2250,9 +1990,6 @@ func (client *WANIPConnection1) RequestTermination() (err error) {
 	return
 }
 
-//
-//
-//
 func (client *WANIPConnection1) ForceTermination() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2274,11 +2011,6 @@ func (client *WANIPConnection1) ForceTermination() (err error) {
 	return
 }
 
-// Arguments:
-//
-// * NewAutoDisconnectTime:
-//
-//
 func (client *WANIPConnection1) SetAutoDisconnectTime(NewAutoDisconnectTime uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2305,11 +2037,6 @@ func (client *WANIPConnection1) SetAutoDisconnectTime(NewAutoDisconnectTime uint
 	return
 }
 
-// Arguments:
-//
-// * NewIdleDisconnectTime:
-//
-//
 func (client *WANIPConnection1) SetIdleDisconnectTime(NewIdleDisconnectTime uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2336,11 +2063,6 @@ func (client *WANIPConnection1) SetIdleDisconnectTime(NewIdleDisconnectTime uint
 	return
 }
 
-// Arguments:
-//
-// * NewWarnDisconnectDelay:
-//
-//
 func (client *WANIPConnection1) SetWarnDisconnectDelay(NewWarnDisconnectDelay uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2367,15 +2089,12 @@ func (client *WANIPConnection1) SetWarnDisconnectDelay(NewWarnDisconnectDelay ui
 	return
 }
 
-//
 //
 // Return values:
 //
 // * NewConnectionStatus: allowed values: Unconfigured, Connected, Disconnected
 //
 // * NewLastConnectionError: allowed values: ERROR_NONE
-//
-// * NewUptime:
 func (client *WANIPConnection1) GetStatusInfo() (NewConnectionStatus string, NewLastConnectionError string, NewUptime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2412,11 +2131,6 @@ func (client *WANIPConnection1) GetStatusInfo() (NewConnectionStatus string, New
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewAutoDisconnectTime:
 func (client *WANIPConnection1) GetAutoDisconnectTime() (NewAutoDisconnectTime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2443,11 +2157,6 @@ func (client *WANIPConnection1) GetAutoDisconnectTime() (NewAutoDisconnectTime u
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewIdleDisconnectTime:
 func (client *WANIPConnection1) GetIdleDisconnectTime() (NewIdleDisconnectTime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2474,11 +2183,6 @@ func (client *WANIPConnection1) GetIdleDisconnectTime() (NewIdleDisconnectTime u
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewWarnDisconnectDelay:
 func (client *WANIPConnection1) GetWarnDisconnectDelay() (NewWarnDisconnectDelay uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2505,13 +2209,6 @@ func (client *WANIPConnection1) GetWarnDisconnectDelay() (NewWarnDisconnectDelay
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewRSIPAvailable:
-//
-// * NewNATEnabled:
 func (client *WANIPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNATEnabled bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2543,27 +2240,10 @@ func (client *WANIPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNA
 	return
 }
 
-// Arguments:
-//
-// * NewPortMappingIndex:
 //
 // Return values:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
 func (client *WANIPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex uint16) (NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -2630,25 +2310,11 @@ func (client *WANIPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex u
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// Return values:
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
+
 func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -2710,25 +2376,11 @@ func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
-//
-//
+
 func (client *WANIPConnection1) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2790,15 +2442,11 @@ func (client *WANIPConnection1) AddPortMapping(NewRemoteHost string, NewExternal
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-//
+
 func (client *WANIPConnection1) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2835,11 +2483,6 @@ func (client *WANIPConnection1) DeletePortMapping(NewRemoteHost string, NewExter
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewExternalIPAddress:
 func (client *WANIPConnection1) GetExternalIPAddress() (NewExternalIPAddress string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2926,15 +2569,11 @@ func newWANPOTSLinkConfig1ClientsFromGenericClients(genericClients []goupnp.Serv
 	return clients
 }
 
+//
 // Arguments:
 //
-// * NewISPPhoneNumber:
-//
-// * NewISPInfo:
-//
 // * NewLinkType: allowed values: PPP_Dialup
-//
-//
+
 func (client *WANPOTSLinkConfig1) SetISPInfo(NewISPPhoneNumber string, NewISPInfo string, NewLinkType string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2971,13 +2610,6 @@ func (client *WANPOTSLinkConfig1) SetISPInfo(NewISPPhoneNumber string, NewISPInf
 	return
 }
 
-// Arguments:
-//
-// * NewNumberOfRetries:
-//
-// * NewDelayBetweenRetries:
-//
-//
 func (client *WANPOTSLinkConfig1) SetCallRetryInfo(NewNumberOfRetries uint32, NewDelayBetweenRetries uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3009,14 +2641,9 @@ func (client *WANPOTSLinkConfig1) SetCallRetryInfo(NewNumberOfRetries uint32, Ne
 	return
 }
 
-//
 //
 // Return values:
 //
-// * NewISPPhoneNumber:
-//
-// * NewISPInfo:
-//
 // * NewLinkType: allowed values: PPP_Dialup
 func (client *WANPOTSLinkConfig1) GetISPInfo() (NewISPPhoneNumber string, NewISPInfo string, NewLinkType string, err error) {
 	// Request structure.
@@ -3054,13 +2681,6 @@ func (client *WANPOTSLinkConfig1) GetISPInfo() (NewISPPhoneNumber string, NewISP
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewNumberOfRetries:
-//
-// * NewDelayBetweenRetries:
 func (client *WANPOTSLinkConfig1) GetCallRetryInfo() (NewNumberOfRetries uint32, NewDelayBetweenRetries uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3092,11 +2712,6 @@ func (client *WANPOTSLinkConfig1) GetCallRetryInfo() (NewNumberOfRetries uint32,
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewFclass:
 func (client *WANPOTSLinkConfig1) GetFclass() (NewFclass string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3123,11 +2738,6 @@ func (client *WANPOTSLinkConfig1) GetFclass() (NewFclass string, err error) {
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDataModulationSupported:
 func (client *WANPOTSLinkConfig1) GetDataModulationSupported() (NewDataModulationSupported string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3154,11 +2764,6 @@ func (client *WANPOTSLinkConfig1) GetDataModulationSupported() (NewDataModulatio
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDataProtocol:
 func (client *WANPOTSLinkConfig1) GetDataProtocol() (NewDataProtocol string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3185,11 +2790,6 @@ func (client *WANPOTSLinkConfig1) GetDataProtocol() (NewDataProtocol string, err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDataCompression:
 func (client *WANPOTSLinkConfig1) GetDataCompression() (NewDataCompression string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3216,11 +2816,6 @@ func (client *WANPOTSLinkConfig1) GetDataCompression() (NewDataCompression strin
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewPlusVTRCommandSupported:
 func (client *WANPOTSLinkConfig1) GetPlusVTRCommandSupported() (NewPlusVTRCommandSupported bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3307,11 +2902,6 @@ func newWANPPPConnection1ClientsFromGenericClients(genericClients []goupnp.Servi
 	return clients
 }
 
-// Arguments:
-//
-// * NewConnectionType:
-//
-//
 func (client *WANPPPConnection1) SetConnectionType(NewConnectionType string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3338,12 +2928,9 @@ func (client *WANPPPConnection1) SetConnectionType(NewConnectionType string) (er
 	return
 }
 
-//
 //
 // Return values:
 //
-// * NewConnectionType:
-//
 // * NewPossibleConnectionTypes: allowed values: Unconfigured, IP_Routed, DHCP_Spoofed, PPPoE_Bridged, PPTP_Relay, L2TP_Relay, PPPoE_Relay
 func (client *WANPPPConnection1) GetConnectionTypeInfo() (NewConnectionType string, NewPossibleConnectionTypes string, err error) {
 	// Request structure.
@@ -3376,13 +2963,6 @@ func (client *WANPPPConnection1) GetConnectionTypeInfo() (NewConnectionType stri
 	return
 }
 
-// Arguments:
-//
-// * NewUserName:
-//
-// * NewPassword:
-//
-//
 func (client *WANPPPConnection1) ConfigureConnection(NewUserName string, NewPassword string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3414,9 +2994,6 @@ func (client *WANPPPConnection1) ConfigureConnection(NewUserName string, NewPass
 	return
 }
 
-//
-//
-//
 func (client *WANPPPConnection1) RequestConnection() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3438,9 +3015,6 @@ func (client *WANPPPConnection1) RequestConnection() (err error) {
 	return
 }
 
-//
-//
-//
 func (client *WANPPPConnection1) RequestTermination() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3462,9 +3036,6 @@ func (client *WANPPPConnection1) RequestTermination() (err error) {
 	return
 }
 
-//
-//
-//
 func (client *WANPPPConnection1) ForceTermination() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3486,11 +3057,6 @@ func (client *WANPPPConnection1) ForceTermination() (err error) {
 	return
 }
 
-// Arguments:
-//
-// * NewAutoDisconnectTime:
-//
-//
 func (client *WANPPPConnection1) SetAutoDisconnectTime(NewAutoDisconnectTime uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3517,11 +3083,6 @@ func (client *WANPPPConnection1) SetAutoDisconnectTime(NewAutoDisconnectTime uin
 	return
 }
 
-// Arguments:
-//
-// * NewIdleDisconnectTime:
-//
-//
 func (client *WANPPPConnection1) SetIdleDisconnectTime(NewIdleDisconnectTime uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3548,11 +3109,6 @@ func (client *WANPPPConnection1) SetIdleDisconnectTime(NewIdleDisconnectTime uin
 	return
 }
 
-// Arguments:
-//
-// * NewWarnDisconnectDelay:
-//
-//
 func (client *WANPPPConnection1) SetWarnDisconnectDelay(NewWarnDisconnectDelay uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3579,15 +3135,12 @@ func (client *WANPPPConnection1) SetWarnDisconnectDelay(NewWarnDisconnectDelay u
 	return
 }
 
-//
 //
 // Return values:
 //
 // * NewConnectionStatus: allowed values: Unconfigured, Connected, Disconnected
 //
 // * NewLastConnectionError: allowed values: ERROR_NONE
-//
-// * NewUptime:
 func (client *WANPPPConnection1) GetStatusInfo() (NewConnectionStatus string, NewLastConnectionError string, NewUptime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3624,13 +3177,6 @@ func (client *WANPPPConnection1) GetStatusInfo() (NewConnectionStatus string, Ne
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewUpstreamMaxBitRate:
-//
-// * NewDownstreamMaxBitRate:
 func (client *WANPPPConnection1) GetLinkLayerMaxBitRates() (NewUpstreamMaxBitRate uint32, NewDownstreamMaxBitRate uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3662,11 +3208,6 @@ func (client *WANPPPConnection1) GetLinkLayerMaxBitRates() (NewUpstreamMaxBitRat
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewPPPEncryptionProtocol:
 func (client *WANPPPConnection1) GetPPPEncryptionProtocol() (NewPPPEncryptionProtocol string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3693,11 +3234,6 @@ func (client *WANPPPConnection1) GetPPPEncryptionProtocol() (NewPPPEncryptionPro
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewPPPCompressionProtocol:
 func (client *WANPPPConnection1) GetPPPCompressionProtocol() (NewPPPCompressionProtocol string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3724,11 +3260,6 @@ func (client *WANPPPConnection1) GetPPPCompressionProtocol() (NewPPPCompressionP
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewPPPAuthenticationProtocol:
 func (client *WANPPPConnection1) GetPPPAuthenticationProtocol() (NewPPPAuthenticationProtocol string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3755,11 +3286,6 @@ func (client *WANPPPConnection1) GetPPPAuthenticationProtocol() (NewPPPAuthentic
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewUserName:
 func (client *WANPPPConnection1) GetUserName() (NewUserName string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3786,11 +3312,6 @@ func (client *WANPPPConnection1) GetUserName() (NewUserName string, err error) {
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewPassword:
 func (client *WANPPPConnection1) GetPassword() (NewPassword string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3817,11 +3338,6 @@ func (client *WANPPPConnection1) GetPassword() (NewPassword string, err error) {
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewAutoDisconnectTime:
 func (client *WANPPPConnection1) GetAutoDisconnectTime() (NewAutoDisconnectTime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3848,11 +3364,6 @@ func (client *WANPPPConnection1) GetAutoDisconnectTime() (NewAutoDisconnectTime
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewIdleDisconnectTime:
 func (client *WANPPPConnection1) GetIdleDisconnectTime() (NewIdleDisconnectTime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3879,11 +3390,6 @@ func (client *WANPPPConnection1) GetIdleDisconnectTime() (NewIdleDisconnectTime
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewWarnDisconnectDelay:
 func (client *WANPPPConnection1) GetWarnDisconnectDelay() (NewWarnDisconnectDelay uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3910,13 +3416,6 @@ func (client *WANPPPConnection1) GetWarnDisconnectDelay() (NewWarnDisconnectDela
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewRSIPAvailable:
-//
-// * NewNATEnabled:
 func (client *WANPPPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNATEnabled bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3948,27 +3447,10 @@ func (client *WANPPPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewN
 	return
 }
 
-// Arguments:
-//
-// * NewPortMappingIndex:
 //
 // Return values:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
 func (client *WANPPPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex uint16) (NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -4035,25 +3517,11 @@ func (client *WANPPPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// Return values:
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
+
 func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -4115,25 +3583,11 @@ func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost strin
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
-//
-//
+
 func (client *WANPPPConnection1) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4195,15 +3649,11 @@ func (client *WANPPPConnection1) AddPortMapping(NewRemoteHost string, NewExterna
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-//
+
 func (client *WANPPPConnection1) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4240,11 +3690,6 @@ func (client *WANPPPConnection1) DeletePortMapping(NewRemoteHost string, NewExte
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewExternalIPAddress:
 func (client *WANPPPConnection1) GetExternalIPAddress() (NewExternalIPAddress string, err error) {
 	// Request structure.
 	request := interface{}(nil)
diff --git a/dcps/internetgateway2/internetgateway2.go b/dcps/internetgateway2/internetgateway2.go
index 2626d00..2d67a4a 100644
--- a/dcps/internetgateway2/internetgateway2.go
+++ b/dcps/internetgateway2/internetgateway2.go
@@ -103,15 +103,6 @@ func newDeviceProtection1ClientsFromGenericClients(genericClients []goupnp.Servi
 	return clients
 }
 
-// Arguments:
-//
-// * ProtocolType:
-//
-// * InMessage:
-//
-// Return values:
-//
-// * OutMessage:
 func (client *DeviceProtection1) SendSetupMessage(ProtocolType string, InMessage []byte) (OutMessage []byte, err error) {
 	// Request structure.
 	request := &struct {
@@ -148,11 +139,6 @@ func (client *DeviceProtection1) SendSetupMessage(ProtocolType string, InMessage
 	return
 }
 
-//
-//
-// Return values:
-//
-// * ProtocolList:
 func (client *DeviceProtection1) GetSupportedProtocols() (ProtocolList string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -179,11 +165,6 @@ func (client *DeviceProtection1) GetSupportedProtocols() (ProtocolList string, e
 	return
 }
 
-//
-//
-// Return values:
-//
-// * RoleList:
 func (client *DeviceProtection1) GetAssignedRoles() (RoleList string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -210,19 +191,6 @@ func (client *DeviceProtection1) GetAssignedRoles() (RoleList string, err error)
 	return
 }
 
-// Arguments:
-//
-// * DeviceUDN:
-//
-// * ServiceId:
-//
-// * ActionName:
-//
-// Return values:
-//
-// * RoleList:
-//
-// * RestrictedRoleList:
 func (client *DeviceProtection1) GetRolesForAction(DeviceUDN string, ServiceId string, ActionName string) (RoleList string, RestrictedRoleList string, err error) {
 	// Request structure.
 	request := &struct {
@@ -269,17 +237,6 @@ func (client *DeviceProtection1) GetRolesForAction(DeviceUDN string, ServiceId s
 	return
 }
 
-// Arguments:
-//
-// * ProtocolType:
-//
-// * Name:
-//
-// Return values:
-//
-// * Salt:
-//
-// * Challenge:
 func (client *DeviceProtection1) GetUserLoginChallenge(ProtocolType string, Name string) (Salt []byte, Challenge []byte, err error) {
 	// Request structure.
 	request := &struct {
@@ -321,15 +278,6 @@ func (client *DeviceProtection1) GetUserLoginChallenge(ProtocolType string, Name
 	return
 }
 
-// Arguments:
-//
-// * ProtocolType:
-//
-// * Challenge:
-//
-// * Authenticator:
-//
-//
 func (client *DeviceProtection1) UserLogin(ProtocolType string, Challenge []byte, Authenticator []byte) (err error) {
 	// Request structure.
 	request := &struct {
@@ -366,9 +314,6 @@ func (client *DeviceProtection1) UserLogin(ProtocolType string, Challenge []byte
 	return
 }
 
-//
-//
-//
 func (client *DeviceProtection1) UserLogout() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -390,11 +335,6 @@ func (client *DeviceProtection1) UserLogout() (err error) {
 	return
 }
 
-//
-//
-// Return values:
-//
-// * ACL:
 func (client *DeviceProtection1) GetACLData() (ACL string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -421,13 +361,6 @@ func (client *DeviceProtection1) GetACLData() (ACL string, err error) {
 	return
 }
 
-// Arguments:
-//
-// * IdentityList:
-//
-// Return values:
-//
-// * IdentityListResult:
 func (client *DeviceProtection1) AddIdentityList(IdentityList string) (IdentityListResult string, err error) {
 	// Request structure.
 	request := &struct {
@@ -459,11 +392,6 @@ func (client *DeviceProtection1) AddIdentityList(IdentityList string) (IdentityL
 	return
 }
 
-// Arguments:
-//
-// * Identity:
-//
-//
 func (client *DeviceProtection1) RemoveIdentity(Identity string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -490,17 +418,6 @@ func (client *DeviceProtection1) RemoveIdentity(Identity string) (err error) {
 	return
 }
 
-// Arguments:
-//
-// * ProtocolType:
-//
-// * Name:
-//
-// * Stored:
-//
-// * Salt:
-//
-//
 func (client *DeviceProtection1) SetUserLoginPassword(ProtocolType string, Name string, Stored []byte, Salt []byte) (err error) {
 	// Request structure.
 	request := &struct {
@@ -542,13 +459,6 @@ func (client *DeviceProtection1) SetUserLoginPassword(ProtocolType string, Name
 	return
 }
 
-// Arguments:
-//
-// * Identity:
-//
-// * RoleList:
-//
-//
 func (client *DeviceProtection1) AddRolesForIdentity(Identity string, RoleList string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -580,13 +490,6 @@ func (client *DeviceProtection1) AddRolesForIdentity(Identity string, RoleList s
 	return
 }
 
-// Arguments:
-//
-// * Identity:
-//
-// * RoleList:
-//
-//
 func (client *DeviceProtection1) RemoveRolesForIdentity(Identity string, RoleList string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -678,11 +581,6 @@ func newLANHostConfigManagement1ClientsFromGenericClients(genericClients []goupn
 	return clients
 }
 
-// Arguments:
-//
-// * NewDHCPServerConfigurable:
-//
-//
 func (client *LANHostConfigManagement1) SetDHCPServerConfigurable(NewDHCPServerConfigurable bool) (err error) {
 	// Request structure.
 	request := &struct {
@@ -709,11 +607,6 @@ func (client *LANHostConfigManagement1) SetDHCPServerConfigurable(NewDHCPServerC
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDHCPServerConfigurable:
 func (client *LANHostConfigManagement1) GetDHCPServerConfigurable() (NewDHCPServerConfigurable bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -740,11 +633,6 @@ func (client *LANHostConfigManagement1) GetDHCPServerConfigurable() (NewDHCPServ
 	return
 }
 
-// Arguments:
-//
-// * NewDHCPRelay:
-//
-//
 func (client *LANHostConfigManagement1) SetDHCPRelay(NewDHCPRelay bool) (err error) {
 	// Request structure.
 	request := &struct {
@@ -771,11 +659,6 @@ func (client *LANHostConfigManagement1) SetDHCPRelay(NewDHCPRelay bool) (err err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDHCPRelay:
 func (client *LANHostConfigManagement1) GetDHCPRelay() (NewDHCPRelay bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -802,11 +685,6 @@ func (client *LANHostConfigManagement1) GetDHCPRelay() (NewDHCPRelay bool, err e
 	return
 }
 
-// Arguments:
-//
-// * NewSubnetMask:
-//
-//
 func (client *LANHostConfigManagement1) SetSubnetMask(NewSubnetMask string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -833,11 +711,6 @@ func (client *LANHostConfigManagement1) SetSubnetMask(NewSubnetMask string) (err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewSubnetMask:
 func (client *LANHostConfigManagement1) GetSubnetMask() (NewSubnetMask string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -864,11 +737,6 @@ func (client *LANHostConfigManagement1) GetSubnetMask() (NewSubnetMask string, e
 	return
 }
 
-// Arguments:
-//
-// * NewIPRouters:
-//
-//
 func (client *LANHostConfigManagement1) SetIPRouter(NewIPRouters string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -895,11 +763,6 @@ func (client *LANHostConfigManagement1) SetIPRouter(NewIPRouters string) (err er
 	return
 }
 
-// Arguments:
-//
-// * NewIPRouters:
-//
-//
 func (client *LANHostConfigManagement1) DeleteIPRouter(NewIPRouters string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -926,11 +789,6 @@ func (client *LANHostConfigManagement1) DeleteIPRouter(NewIPRouters string) (err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewIPRouters:
 func (client *LANHostConfigManagement1) GetIPRoutersList() (NewIPRouters string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -957,11 +815,6 @@ func (client *LANHostConfigManagement1) GetIPRoutersList() (NewIPRouters string,
 	return
 }
 
-// Arguments:
-//
-// * NewDomainName:
-//
-//
 func (client *LANHostConfigManagement1) SetDomainName(NewDomainName string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -988,11 +841,6 @@ func (client *LANHostConfigManagement1) SetDomainName(NewDomainName string) (err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDomainName:
 func (client *LANHostConfigManagement1) GetDomainName() (NewDomainName string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1019,13 +867,6 @@ func (client *LANHostConfigManagement1) GetDomainName() (NewDomainName string, e
 	return
 }
 
-// Arguments:
-//
-// * NewMinAddress:
-//
-// * NewMaxAddress:
-//
-//
 func (client *LANHostConfigManagement1) SetAddressRange(NewMinAddress string, NewMaxAddress string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1057,13 +898,6 @@ func (client *LANHostConfigManagement1) SetAddressRange(NewMinAddress string, Ne
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewMinAddress:
-//
-// * NewMaxAddress:
 func (client *LANHostConfigManagement1) GetAddressRange() (NewMinAddress string, NewMaxAddress string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1095,11 +929,6 @@ func (client *LANHostConfigManagement1) GetAddressRange() (NewMinAddress string,
 	return
 }
 
-// Arguments:
-//
-// * NewReservedAddresses:
-//
-//
 func (client *LANHostConfigManagement1) SetReservedAddress(NewReservedAddresses string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1126,11 +955,6 @@ func (client *LANHostConfigManagement1) SetReservedAddress(NewReservedAddresses
 	return
 }
 
-// Arguments:
-//
-// * NewReservedAddresses:
-//
-//
 func (client *LANHostConfigManagement1) DeleteReservedAddress(NewReservedAddresses string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1157,11 +981,6 @@ func (client *LANHostConfigManagement1) DeleteReservedAddress(NewReservedAddress
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewReservedAddresses:
 func (client *LANHostConfigManagement1) GetReservedAddresses() (NewReservedAddresses string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1188,11 +1007,6 @@ func (client *LANHostConfigManagement1) GetReservedAddresses() (NewReservedAddre
 	return
 }
 
-// Arguments:
-//
-// * NewDNSServers:
-//
-//
 func (client *LANHostConfigManagement1) SetDNSServer(NewDNSServers string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1219,11 +1033,6 @@ func (client *LANHostConfigManagement1) SetDNSServer(NewDNSServers string) (err
 	return
 }
 
-// Arguments:
-//
-// * NewDNSServers:
-//
-//
 func (client *LANHostConfigManagement1) DeleteDNSServer(NewDNSServers string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1250,11 +1059,6 @@ func (client *LANHostConfigManagement1) DeleteDNSServer(NewDNSServers string) (e
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDNSServers:
 func (client *LANHostConfigManagement1) GetDNSServers() (NewDNSServers string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1341,11 +1145,6 @@ func newLayer3Forwarding1ClientsFromGenericClients(genericClients []goupnp.Servi
 	return clients
 }
 
-// Arguments:
-//
-// * NewDefaultConnectionService:
-//
-//
 func (client *Layer3Forwarding1) SetDefaultConnectionService(NewDefaultConnectionService string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1372,11 +1171,6 @@ func (client *Layer3Forwarding1) SetDefaultConnectionService(NewDefaultConnectio
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDefaultConnectionService:
 func (client *Layer3Forwarding1) GetDefaultConnectionService() (NewDefaultConnectionService string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1463,7 +1257,6 @@ func newWANCableLinkConfig1ClientsFromGenericClients(genericClients []goupnp.Ser
 	return clients
 }
 
-//
 //
 // Return values:
 //
@@ -1501,11 +1294,6 @@ func (client *WANCableLinkConfig1) GetCableLinkConfigInfo() (NewCableLinkConfigS
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDownstreamFrequency:
 func (client *WANCableLinkConfig1) GetDownstreamFrequency() (NewDownstreamFrequency uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1532,7 +1320,6 @@ func (client *WANCableLinkConfig1) GetDownstreamFrequency() (NewDownstreamFreque
 	return
 }
 
-//
 //
 // Return values:
 //
@@ -1563,11 +1350,6 @@ func (client *WANCableLinkConfig1) GetDownstreamModulation() (NewDownstreamModul
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewUpstreamFrequency:
 func (client *WANCableLinkConfig1) GetUpstreamFrequency() (NewUpstreamFrequency uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1594,7 +1376,6 @@ func (client *WANCableLinkConfig1) GetUpstreamFrequency() (NewUpstreamFrequency
 	return
 }
 
-//
 //
 // Return values:
 //
@@ -1625,11 +1406,6 @@ func (client *WANCableLinkConfig1) GetUpstreamModulation() (NewUpstreamModulatio
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewUpstreamChannelID:
 func (client *WANCableLinkConfig1) GetUpstreamChannelID() (NewUpstreamChannelID uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1656,11 +1432,6 @@ func (client *WANCableLinkConfig1) GetUpstreamChannelID() (NewUpstreamChannelID
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewUpstreamPowerLevel:
 func (client *WANCableLinkConfig1) GetUpstreamPowerLevel() (NewUpstreamPowerLevel uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1687,11 +1458,6 @@ func (client *WANCableLinkConfig1) GetUpstreamPowerLevel() (NewUpstreamPowerLeve
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewBPIEncryptionEnabled:
 func (client *WANCableLinkConfig1) GetBPIEncryptionEnabled() (NewBPIEncryptionEnabled bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1718,11 +1484,6 @@ func (client *WANCableLinkConfig1) GetBPIEncryptionEnabled() (NewBPIEncryptionEn
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewConfigFile:
 func (client *WANCableLinkConfig1) GetConfigFile() (NewConfigFile string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1749,11 +1510,6 @@ func (client *WANCableLinkConfig1) GetConfigFile() (NewConfigFile string, err er
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewTFTPServer:
 func (client *WANCableLinkConfig1) GetTFTPServer() (NewTFTPServer string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1840,11 +1596,6 @@ func newWANCommonInterfaceConfig1ClientsFromGenericClients(genericClients []goup
 	return clients
 }
 
-// Arguments:
-//
-// * NewEnabledForInternet:
-//
-//
 func (client *WANCommonInterfaceConfig1) SetEnabledForInternet(NewEnabledForInternet bool) (err error) {
 	// Request structure.
 	request := &struct {
@@ -1871,11 +1622,6 @@ func (client *WANCommonInterfaceConfig1) SetEnabledForInternet(NewEnabledForInte
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewEnabledForInternet:
 func (client *WANCommonInterfaceConfig1) GetEnabledForInternet() (NewEnabledForInternet bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1902,16 +1648,11 @@ func (client *WANCommonInterfaceConfig1) GetEnabledForInternet() (NewEnabledForI
 	return
 }
 
-//
 //
 // Return values:
 //
 // * NewWANAccessType: allowed values: DSL, POTS, Cable, Ethernet
 //
-// * NewLayer1UpstreamMaxBitRate:
-//
-// * NewLayer1DownstreamMaxBitRate:
-//
 // * NewPhysicalLinkStatus: allowed values: Up, Down
 func (client *WANCommonInterfaceConfig1) GetCommonLinkProperties() (NewWANAccessType string, NewLayer1UpstreamMaxBitRate uint32, NewLayer1DownstreamMaxBitRate uint32, NewPhysicalLinkStatus string, err error) {
 	// Request structure.
@@ -1954,11 +1695,6 @@ func (client *WANCommonInterfaceConfig1) GetCommonLinkProperties() (NewWANAccess
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewWANAccessProvider:
 func (client *WANCommonInterfaceConfig1) GetWANAccessProvider() (NewWANAccessProvider string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -1985,7 +1721,6 @@ func (client *WANCommonInterfaceConfig1) GetWANAccessProvider() (NewWANAccessPro
 	return
 }
 
-//
 //
 // Return values:
 //
@@ -2016,11 +1751,6 @@ func (client *WANCommonInterfaceConfig1) GetMaximumActiveConnections() (NewMaxim
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewTotalBytesSent:
 func (client *WANCommonInterfaceConfig1) GetTotalBytesSent() (NewTotalBytesSent uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2047,11 +1777,6 @@ func (client *WANCommonInterfaceConfig1) GetTotalBytesSent() (NewTotalBytesSent
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewTotalBytesReceived:
 func (client *WANCommonInterfaceConfig1) GetTotalBytesReceived() (NewTotalBytesReceived uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2078,11 +1803,6 @@ func (client *WANCommonInterfaceConfig1) GetTotalBytesReceived() (NewTotalBytesR
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewTotalPacketsSent:
 func (client *WANCommonInterfaceConfig1) GetTotalPacketsSent() (NewTotalPacketsSent uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2109,11 +1829,6 @@ func (client *WANCommonInterfaceConfig1) GetTotalPacketsSent() (NewTotalPacketsS
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewTotalPacketsReceived:
 func (client *WANCommonInterfaceConfig1) GetTotalPacketsReceived() (NewTotalPacketsReceived uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2140,15 +1855,6 @@ func (client *WANCommonInterfaceConfig1) GetTotalPacketsReceived() (NewTotalPack
 	return
 }
 
-// Arguments:
-//
-// * NewActiveConnectionIndex:
-//
-// Return values:
-//
-// * NewActiveConnDeviceContainer:
-//
-// * NewActiveConnectionServiceID:
 func (client *WANCommonInterfaceConfig1) GetActiveConnection(NewActiveConnectionIndex uint16) (NewActiveConnDeviceContainer string, NewActiveConnectionServiceID string, err error) {
 	// Request structure.
 	request := &struct {
@@ -2245,11 +1951,6 @@ func newWANDSLLinkConfig1ClientsFromGenericClients(genericClients []goupnp.Servi
 	return clients
 }
 
-// Arguments:
-//
-// * NewLinkType:
-//
-//
 func (client *WANDSLLinkConfig1) SetDSLLinkType(NewLinkType string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2276,12 +1977,9 @@ func (client *WANDSLLinkConfig1) SetDSLLinkType(NewLinkType string) (err error)
 	return
 }
 
-//
 //
 // Return values:
 //
-// * NewLinkType:
-//
 // * NewLinkStatus: allowed values: Up, Down
 func (client *WANDSLLinkConfig1) GetDSLLinkInfo() (NewLinkType string, NewLinkStatus string, err error) {
 	// Request structure.
@@ -2314,11 +2012,6 @@ func (client *WANDSLLinkConfig1) GetDSLLinkInfo() (NewLinkType string, NewLinkSt
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewAutoConfig:
 func (client *WANDSLLinkConfig1) GetAutoConfig() (NewAutoConfig bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2345,11 +2038,6 @@ func (client *WANDSLLinkConfig1) GetAutoConfig() (NewAutoConfig bool, err error)
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewModulationType:
 func (client *WANDSLLinkConfig1) GetModulationType() (NewModulationType string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2376,11 +2064,6 @@ func (client *WANDSLLinkConfig1) GetModulationType() (NewModulationType string,
 	return
 }
 
-// Arguments:
-//
-// * NewDestinationAddress:
-//
-//
 func (client *WANDSLLinkConfig1) SetDestinationAddress(NewDestinationAddress string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2407,11 +2090,6 @@ func (client *WANDSLLinkConfig1) SetDestinationAddress(NewDestinationAddress str
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDestinationAddress:
 func (client *WANDSLLinkConfig1) GetDestinationAddress() (NewDestinationAddress string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2438,11 +2116,6 @@ func (client *WANDSLLinkConfig1) GetDestinationAddress() (NewDestinationAddress
 	return
 }
 
-// Arguments:
-//
-// * NewATMEncapsulation:
-//
-//
 func (client *WANDSLLinkConfig1) SetATMEncapsulation(NewATMEncapsulation string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2469,11 +2142,6 @@ func (client *WANDSLLinkConfig1) SetATMEncapsulation(NewATMEncapsulation string)
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewATMEncapsulation:
 func (client *WANDSLLinkConfig1) GetATMEncapsulation() (NewATMEncapsulation string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2500,11 +2168,6 @@ func (client *WANDSLLinkConfig1) GetATMEncapsulation() (NewATMEncapsulation stri
 	return
 }
 
-// Arguments:
-//
-// * NewFCSPreserved:
-//
-//
 func (client *WANDSLLinkConfig1) SetFCSPreserved(NewFCSPreserved bool) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2531,11 +2194,6 @@ func (client *WANDSLLinkConfig1) SetFCSPreserved(NewFCSPreserved bool) (err erro
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewFCSPreserved:
 func (client *WANDSLLinkConfig1) GetFCSPreserved() (NewFCSPreserved bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2622,7 +2280,6 @@ func newWANEthernetLinkConfig1ClientsFromGenericClients(genericClients []goupnp.
 	return clients
 }
 
-//
 //
 // Return values:
 //
@@ -2713,11 +2370,6 @@ func newWANIPConnection1ClientsFromGenericClients(genericClients []goupnp.Servic
 	return clients
 }
 
-// Arguments:
-//
-// * NewConnectionType:
-//
-//
 func (client *WANIPConnection1) SetConnectionType(NewConnectionType string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2744,12 +2396,9 @@ func (client *WANIPConnection1) SetConnectionType(NewConnectionType string) (err
 	return
 }
 
-//
 //
 // Return values:
 //
-// * NewConnectionType:
-//
 // * NewPossibleConnectionTypes: allowed values: Unconfigured, IP_Routed, IP_Bridged
 func (client *WANIPConnection1) GetConnectionTypeInfo() (NewConnectionType string, NewPossibleConnectionTypes string, err error) {
 	// Request structure.
@@ -2782,9 +2431,6 @@ func (client *WANIPConnection1) GetConnectionTypeInfo() (NewConnectionType strin
 	return
 }
 
-//
-//
-//
 func (client *WANIPConnection1) RequestConnection() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2806,9 +2452,6 @@ func (client *WANIPConnection1) RequestConnection() (err error) {
 	return
 }
 
-//
-//
-//
 func (client *WANIPConnection1) RequestTermination() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2830,9 +2473,6 @@ func (client *WANIPConnection1) RequestTermination() (err error) {
 	return
 }
 
-//
-//
-//
 func (client *WANIPConnection1) ForceTermination() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2854,11 +2494,6 @@ func (client *WANIPConnection1) ForceTermination() (err error) {
 	return
 }
 
-// Arguments:
-//
-// * NewAutoDisconnectTime:
-//
-//
 func (client *WANIPConnection1) SetAutoDisconnectTime(NewAutoDisconnectTime uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2885,11 +2520,6 @@ func (client *WANIPConnection1) SetAutoDisconnectTime(NewAutoDisconnectTime uint
 	return
 }
 
-// Arguments:
-//
-// * NewIdleDisconnectTime:
-//
-//
 func (client *WANIPConnection1) SetIdleDisconnectTime(NewIdleDisconnectTime uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2916,11 +2546,6 @@ func (client *WANIPConnection1) SetIdleDisconnectTime(NewIdleDisconnectTime uint
 	return
 }
 
-// Arguments:
-//
-// * NewWarnDisconnectDelay:
-//
-//
 func (client *WANIPConnection1) SetWarnDisconnectDelay(NewWarnDisconnectDelay uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -2947,15 +2572,12 @@ func (client *WANIPConnection1) SetWarnDisconnectDelay(NewWarnDisconnectDelay ui
 	return
 }
 
-//
 //
 // Return values:
 //
 // * NewConnectionStatus: allowed values: Unconfigured, Connected, Disconnected
 //
 // * NewLastConnectionError: allowed values: ERROR_NONE
-//
-// * NewUptime:
 func (client *WANIPConnection1) GetStatusInfo() (NewConnectionStatus string, NewLastConnectionError string, NewUptime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -2992,11 +2614,6 @@ func (client *WANIPConnection1) GetStatusInfo() (NewConnectionStatus string, New
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewAutoDisconnectTime:
 func (client *WANIPConnection1) GetAutoDisconnectTime() (NewAutoDisconnectTime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3023,11 +2640,6 @@ func (client *WANIPConnection1) GetAutoDisconnectTime() (NewAutoDisconnectTime u
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewIdleDisconnectTime:
 func (client *WANIPConnection1) GetIdleDisconnectTime() (NewIdleDisconnectTime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3054,11 +2666,6 @@ func (client *WANIPConnection1) GetIdleDisconnectTime() (NewIdleDisconnectTime u
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewWarnDisconnectDelay:
 func (client *WANIPConnection1) GetWarnDisconnectDelay() (NewWarnDisconnectDelay uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3085,13 +2692,6 @@ func (client *WANIPConnection1) GetWarnDisconnectDelay() (NewWarnDisconnectDelay
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewRSIPAvailable:
-//
-// * NewNATEnabled:
 func (client *WANIPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNATEnabled bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3123,27 +2723,10 @@ func (client *WANIPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNA
 	return
 }
 
-// Arguments:
-//
-// * NewPortMappingIndex:
 //
 // Return values:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
 func (client *WANIPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex uint16) (NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -3210,25 +2793,11 @@ func (client *WANIPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex u
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// Return values:
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
+
 func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -3290,25 +2859,11 @@ func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
-//
-//
+
 func (client *WANIPConnection1) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3370,15 +2925,11 @@ func (client *WANIPConnection1) AddPortMapping(NewRemoteHost string, NewExternal
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-//
+
 func (client *WANIPConnection1) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3415,11 +2966,6 @@ func (client *WANIPConnection1) DeletePortMapping(NewRemoteHost string, NewExter
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewExternalIPAddress:
 func (client *WANIPConnection1) GetExternalIPAddress() (NewExternalIPAddress string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3506,11 +3052,6 @@ func newWANIPConnection2ClientsFromGenericClients(genericClients []goupnp.Servic
 	return clients
 }
 
-// Arguments:
-//
-// * NewConnectionType:
-//
-//
 func (client *WANIPConnection2) SetConnectionType(NewConnectionType string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3537,13 +3078,6 @@ func (client *WANIPConnection2) SetConnectionType(NewConnectionType string) (err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewConnectionType:
-//
-// * NewPossibleConnectionTypes:
 func (client *WANIPConnection2) GetConnectionTypeInfo() (NewConnectionType string, NewPossibleConnectionTypes string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3575,9 +3109,6 @@ func (client *WANIPConnection2) GetConnectionTypeInfo() (NewConnectionType strin
 	return
 }
 
-//
-//
-//
 func (client *WANIPConnection2) RequestConnection() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3599,9 +3130,6 @@ func (client *WANIPConnection2) RequestConnection() (err error) {
 	return
 }
 
-//
-//
-//
 func (client *WANIPConnection2) RequestTermination() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3623,9 +3151,6 @@ func (client *WANIPConnection2) RequestTermination() (err error) {
 	return
 }
 
-//
-//
-//
 func (client *WANIPConnection2) ForceTermination() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3647,11 +3172,6 @@ func (client *WANIPConnection2) ForceTermination() (err error) {
 	return
 }
 
-// Arguments:
-//
-// * NewAutoDisconnectTime:
-//
-//
 func (client *WANIPConnection2) SetAutoDisconnectTime(NewAutoDisconnectTime uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3678,11 +3198,6 @@ func (client *WANIPConnection2) SetAutoDisconnectTime(NewAutoDisconnectTime uint
 	return
 }
 
-// Arguments:
-//
-// * NewIdleDisconnectTime:
-//
-//
 func (client *WANIPConnection2) SetIdleDisconnectTime(NewIdleDisconnectTime uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3709,11 +3224,6 @@ func (client *WANIPConnection2) SetIdleDisconnectTime(NewIdleDisconnectTime uint
 	return
 }
 
-// Arguments:
-//
-// * NewWarnDisconnectDelay:
-//
-//
 func (client *WANIPConnection2) SetWarnDisconnectDelay(NewWarnDisconnectDelay uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -3740,15 +3250,12 @@ func (client *WANIPConnection2) SetWarnDisconnectDelay(NewWarnDisconnectDelay ui
 	return
 }
 
-//
 //
 // Return values:
 //
 // * NewConnectionStatus: allowed values: Unconfigured, Connecting, Connected, PendingDisconnect, Disconnecting, Disconnected
 //
 // * NewLastConnectionError: allowed values: ERROR_NONE, ERROR_COMMAND_ABORTED, ERROR_NOT_ENABLED_FOR_INTERNET, ERROR_USER_DISCONNECT, ERROR_ISP_DISCONNECT, ERROR_IDLE_DISCONNECT, ERROR_FORCED_DISCONNECT, ERROR_NO_CARRIER, ERROR_IP_CONFIGURATION, ERROR_UNKNOWN
-//
-// * NewUptime:
 func (client *WANIPConnection2) GetStatusInfo() (NewConnectionStatus string, NewLastConnectionError string, NewUptime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3785,11 +3292,6 @@ func (client *WANIPConnection2) GetStatusInfo() (NewConnectionStatus string, New
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewAutoDisconnectTime:
 func (client *WANIPConnection2) GetAutoDisconnectTime() (NewAutoDisconnectTime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3816,11 +3318,6 @@ func (client *WANIPConnection2) GetAutoDisconnectTime() (NewAutoDisconnectTime u
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewIdleDisconnectTime:
 func (client *WANIPConnection2) GetIdleDisconnectTime() (NewIdleDisconnectTime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3847,11 +3344,6 @@ func (client *WANIPConnection2) GetIdleDisconnectTime() (NewIdleDisconnectTime u
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewWarnDisconnectDelay:
 func (client *WANIPConnection2) GetWarnDisconnectDelay() (NewWarnDisconnectDelay uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3878,13 +3370,6 @@ func (client *WANIPConnection2) GetWarnDisconnectDelay() (NewWarnDisconnectDelay
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewRSIPAvailable:
-//
-// * NewNATEnabled:
 func (client *WANIPConnection2) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNATEnabled bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -3916,27 +3401,10 @@ func (client *WANIPConnection2) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNA
 	return
 }
 
-// Arguments:
-//
-// * NewPortMappingIndex:
 //
 // Return values:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
 func (client *WANIPConnection2) GetGenericPortMappingEntry(NewPortMappingIndex uint16) (NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -4003,25 +3471,11 @@ func (client *WANIPConnection2) GetGenericPortMappingEntry(NewPortMappingIndex u
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// Return values:
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
+
 func (client *WANIPConnection2) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -4083,25 +3537,11 @@ func (client *WANIPConnection2) GetSpecificPortMappingEntry(NewRemoteHost string
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
-//
-//
+
 func (client *WANIPConnection2) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4163,15 +3603,11 @@ func (client *WANIPConnection2) AddPortMapping(NewRemoteHost string, NewExternal
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-//
+
 func (client *WANIPConnection2) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4208,17 +3644,11 @@ func (client *WANIPConnection2) DeletePortMapping(NewRemoteHost string, NewExter
 	return
 }
 
+//
 // Arguments:
 //
-// * NewStartPort:
-//
-// * NewEndPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// * NewManage:
-//
-//
+
 func (client *WANIPConnection2) DeletePortMappingRange(NewStartPort uint16, NewEndPort uint16, NewProtocol string, NewManage bool) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4260,11 +3690,6 @@ func (client *WANIPConnection2) DeletePortMappingRange(NewStartPort uint16, NewE
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewExternalIPAddress:
 func (client *WANIPConnection2) GetExternalIPAddress() (NewExternalIPAddress string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -4291,21 +3716,11 @@ func (client *WANIPConnection2) GetExternalIPAddress() (NewExternalIPAddress str
 	return
 }
 
+//
 // Arguments:
 //
-// * NewStartPort:
-//
-// * NewEndPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// * NewManage:
-//
-// * NewNumberOfPorts:
-//
-// Return values:
-//
-// * NewPortListing:
+
 func (client *WANIPConnection2) GetListOfPortMappings(NewStartPort uint16, NewEndPort uint16, NewProtocol string, NewManage bool, NewNumberOfPorts uint16) (NewPortListing string, err error) {
 	// Request structure.
 	request := &struct {
@@ -4357,27 +3772,11 @@ func (client *WANIPConnection2) GetListOfPortMappings(NewStartPort uint16, NewEn
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
-//
-// Return values:
-//
-// * NewReservedPort:
+
 func (client *WANIPConnection2) AddAnyPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (NewReservedPort uint16, err error) {
 	// Request structure.
 	request := &struct {
@@ -4504,13 +3903,6 @@ func newWANIPv6FirewallControl1ClientsFromGenericClients(genericClients []goupnp
 	return clients
 }
 
-//
-//
-// Return values:
-//
-// * FirewallEnabled:
-//
-// * InboundPinholeAllowed:
 func (client *WANIPv6FirewallControl1) GetFirewallStatus() (FirewallEnabled bool, InboundPinholeAllowed bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -4542,21 +3934,6 @@ func (client *WANIPv6FirewallControl1) GetFirewallStatus() (FirewallEnabled bool
 	return
 }
 
-// Arguments:
-//
-// * RemoteHost:
-//
-// * RemotePort:
-//
-// * InternalClient:
-//
-// * InternalPort:
-//
-// * Protocol:
-//
-// Return values:
-//
-// * OutboundPinholeTimeout:
 func (client *WANIPv6FirewallControl1) GetOutboundPinholeTimeout(RemoteHost string, RemotePort uint16, InternalClient string, InternalPort uint16, Protocol uint16) (OutboundPinholeTimeout uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -4608,23 +3985,11 @@ func (client *WANIPv6FirewallControl1) GetOutboundPinholeTimeout(RemoteHost stri
 	return
 }
 
+//
 // Arguments:
 //
-// * RemoteHost:
-//
-// * RemotePort:
-//
-// * InternalClient:
-//
-// * InternalPort:
-//
-// * Protocol:
-//
 // * LeaseTime: allowed value range: minimum=1, maximum=86400
-//
-// Return values:
-//
-// * UniqueID:
+
 func (client *WANIPv6FirewallControl1) AddPinhole(RemoteHost string, RemotePort uint16, InternalClient string, InternalPort uint16, Protocol uint16, LeaseTime uint32) (UniqueID uint16, err error) {
 	// Request structure.
 	request := &struct {
@@ -4681,13 +4046,11 @@ func (client *WANIPv6FirewallControl1) AddPinhole(RemoteHost string, RemotePort
 	return
 }
 
+//
 // Arguments:
 //
-// * UniqueID:
-//
 // * NewLeaseTime: allowed value range: minimum=1, maximum=86400
-//
-//
+
 func (client *WANIPv6FirewallControl1) UpdatePinhole(UniqueID uint16, NewLeaseTime uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4719,11 +4082,6 @@ func (client *WANIPv6FirewallControl1) UpdatePinhole(UniqueID uint16, NewLeaseTi
 	return
 }
 
-// Arguments:
-//
-// * UniqueID:
-//
-//
 func (client *WANIPv6FirewallControl1) DeletePinhole(UniqueID uint16) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4750,13 +4108,6 @@ func (client *WANIPv6FirewallControl1) DeletePinhole(UniqueID uint16) (err error
 	return
 }
 
-// Arguments:
-//
-// * UniqueID:
-//
-// Return values:
-//
-// * PinholePackets:
 func (client *WANIPv6FirewallControl1) GetPinholePackets(UniqueID uint16) (PinholePackets uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -4788,13 +4139,6 @@ func (client *WANIPv6FirewallControl1) GetPinholePackets(UniqueID uint16) (Pinho
 	return
 }
 
-// Arguments:
-//
-// * UniqueID:
-//
-// Return values:
-//
-// * IsWorking:
 func (client *WANIPv6FirewallControl1) CheckPinholeWorking(UniqueID uint16) (IsWorking bool, err error) {
 	// Request structure.
 	request := &struct {
@@ -4886,15 +4230,11 @@ func newWANPOTSLinkConfig1ClientsFromGenericClients(genericClients []goupnp.Serv
 	return clients
 }
 
+//
 // Arguments:
 //
-// * NewISPPhoneNumber:
-//
-// * NewISPInfo:
-//
 // * NewLinkType: allowed values: PPP_Dialup
-//
-//
+
 func (client *WANPOTSLinkConfig1) SetISPInfo(NewISPPhoneNumber string, NewISPInfo string, NewLinkType string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4931,13 +4271,6 @@ func (client *WANPOTSLinkConfig1) SetISPInfo(NewISPPhoneNumber string, NewISPInf
 	return
 }
 
-// Arguments:
-//
-// * NewNumberOfRetries:
-//
-// * NewDelayBetweenRetries:
-//
-//
 func (client *WANPOTSLinkConfig1) SetCallRetryInfo(NewNumberOfRetries uint32, NewDelayBetweenRetries uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -4969,14 +4302,9 @@ func (client *WANPOTSLinkConfig1) SetCallRetryInfo(NewNumberOfRetries uint32, Ne
 	return
 }
 
-//
 //
 // Return values:
 //
-// * NewISPPhoneNumber:
-//
-// * NewISPInfo:
-//
 // * NewLinkType: allowed values: PPP_Dialup
 func (client *WANPOTSLinkConfig1) GetISPInfo() (NewISPPhoneNumber string, NewISPInfo string, NewLinkType string, err error) {
 	// Request structure.
@@ -5014,13 +4342,6 @@ func (client *WANPOTSLinkConfig1) GetISPInfo() (NewISPPhoneNumber string, NewISP
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewNumberOfRetries:
-//
-// * NewDelayBetweenRetries:
 func (client *WANPOTSLinkConfig1) GetCallRetryInfo() (NewNumberOfRetries uint32, NewDelayBetweenRetries uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5052,11 +4373,6 @@ func (client *WANPOTSLinkConfig1) GetCallRetryInfo() (NewNumberOfRetries uint32,
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewFclass:
 func (client *WANPOTSLinkConfig1) GetFclass() (NewFclass string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5083,11 +4399,6 @@ func (client *WANPOTSLinkConfig1) GetFclass() (NewFclass string, err error) {
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDataModulationSupported:
 func (client *WANPOTSLinkConfig1) GetDataModulationSupported() (NewDataModulationSupported string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5114,11 +4425,6 @@ func (client *WANPOTSLinkConfig1) GetDataModulationSupported() (NewDataModulatio
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDataProtocol:
 func (client *WANPOTSLinkConfig1) GetDataProtocol() (NewDataProtocol string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5145,11 +4451,6 @@ func (client *WANPOTSLinkConfig1) GetDataProtocol() (NewDataProtocol string, err
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewDataCompression:
 func (client *WANPOTSLinkConfig1) GetDataCompression() (NewDataCompression string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5176,11 +4477,6 @@ func (client *WANPOTSLinkConfig1) GetDataCompression() (NewDataCompression strin
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewPlusVTRCommandSupported:
 func (client *WANPOTSLinkConfig1) GetPlusVTRCommandSupported() (NewPlusVTRCommandSupported bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5267,11 +4563,6 @@ func newWANPPPConnection1ClientsFromGenericClients(genericClients []goupnp.Servi
 	return clients
 }
 
-// Arguments:
-//
-// * NewConnectionType:
-//
-//
 func (client *WANPPPConnection1) SetConnectionType(NewConnectionType string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5298,12 +4589,9 @@ func (client *WANPPPConnection1) SetConnectionType(NewConnectionType string) (er
 	return
 }
 
-//
 //
 // Return values:
 //
-// * NewConnectionType:
-//
 // * NewPossibleConnectionTypes: allowed values: Unconfigured, IP_Routed, DHCP_Spoofed, PPPoE_Bridged, PPTP_Relay, L2TP_Relay, PPPoE_Relay
 func (client *WANPPPConnection1) GetConnectionTypeInfo() (NewConnectionType string, NewPossibleConnectionTypes string, err error) {
 	// Request structure.
@@ -5336,13 +4624,6 @@ func (client *WANPPPConnection1) GetConnectionTypeInfo() (NewConnectionType stri
 	return
 }
 
-// Arguments:
-//
-// * NewUserName:
-//
-// * NewPassword:
-//
-//
 func (client *WANPPPConnection1) ConfigureConnection(NewUserName string, NewPassword string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5374,9 +4655,6 @@ func (client *WANPPPConnection1) ConfigureConnection(NewUserName string, NewPass
 	return
 }
 
-//
-//
-//
 func (client *WANPPPConnection1) RequestConnection() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5398,9 +4676,6 @@ func (client *WANPPPConnection1) RequestConnection() (err error) {
 	return
 }
 
-//
-//
-//
 func (client *WANPPPConnection1) RequestTermination() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5422,9 +4697,6 @@ func (client *WANPPPConnection1) RequestTermination() (err error) {
 	return
 }
 
-//
-//
-//
 func (client *WANPPPConnection1) ForceTermination() (err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5446,11 +4718,6 @@ func (client *WANPPPConnection1) ForceTermination() (err error) {
 	return
 }
 
-// Arguments:
-//
-// * NewAutoDisconnectTime:
-//
-//
 func (client *WANPPPConnection1) SetAutoDisconnectTime(NewAutoDisconnectTime uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5477,11 +4744,6 @@ func (client *WANPPPConnection1) SetAutoDisconnectTime(NewAutoDisconnectTime uin
 	return
 }
 
-// Arguments:
-//
-// * NewIdleDisconnectTime:
-//
-//
 func (client *WANPPPConnection1) SetIdleDisconnectTime(NewIdleDisconnectTime uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5508,11 +4770,6 @@ func (client *WANPPPConnection1) SetIdleDisconnectTime(NewIdleDisconnectTime uin
 	return
 }
 
-// Arguments:
-//
-// * NewWarnDisconnectDelay:
-//
-//
 func (client *WANPPPConnection1) SetWarnDisconnectDelay(NewWarnDisconnectDelay uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -5539,15 +4796,12 @@ func (client *WANPPPConnection1) SetWarnDisconnectDelay(NewWarnDisconnectDelay u
 	return
 }
 
-//
 //
 // Return values:
 //
 // * NewConnectionStatus: allowed values: Unconfigured, Connected, Disconnected
 //
 // * NewLastConnectionError: allowed values: ERROR_NONE
-//
-// * NewUptime:
 func (client *WANPPPConnection1) GetStatusInfo() (NewConnectionStatus string, NewLastConnectionError string, NewUptime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5584,13 +4838,6 @@ func (client *WANPPPConnection1) GetStatusInfo() (NewConnectionStatus string, Ne
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewUpstreamMaxBitRate:
-//
-// * NewDownstreamMaxBitRate:
 func (client *WANPPPConnection1) GetLinkLayerMaxBitRates() (NewUpstreamMaxBitRate uint32, NewDownstreamMaxBitRate uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5622,11 +4869,6 @@ func (client *WANPPPConnection1) GetLinkLayerMaxBitRates() (NewUpstreamMaxBitRat
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewPPPEncryptionProtocol:
 func (client *WANPPPConnection1) GetPPPEncryptionProtocol() (NewPPPEncryptionProtocol string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5653,11 +4895,6 @@ func (client *WANPPPConnection1) GetPPPEncryptionProtocol() (NewPPPEncryptionPro
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewPPPCompressionProtocol:
 func (client *WANPPPConnection1) GetPPPCompressionProtocol() (NewPPPCompressionProtocol string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5684,11 +4921,6 @@ func (client *WANPPPConnection1) GetPPPCompressionProtocol() (NewPPPCompressionP
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewPPPAuthenticationProtocol:
 func (client *WANPPPConnection1) GetPPPAuthenticationProtocol() (NewPPPAuthenticationProtocol string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5715,11 +4947,6 @@ func (client *WANPPPConnection1) GetPPPAuthenticationProtocol() (NewPPPAuthentic
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewUserName:
 func (client *WANPPPConnection1) GetUserName() (NewUserName string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5746,11 +4973,6 @@ func (client *WANPPPConnection1) GetUserName() (NewUserName string, err error) {
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewPassword:
 func (client *WANPPPConnection1) GetPassword() (NewPassword string, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5777,11 +4999,6 @@ func (client *WANPPPConnection1) GetPassword() (NewPassword string, err error) {
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewAutoDisconnectTime:
 func (client *WANPPPConnection1) GetAutoDisconnectTime() (NewAutoDisconnectTime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5808,11 +5025,6 @@ func (client *WANPPPConnection1) GetAutoDisconnectTime() (NewAutoDisconnectTime
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewIdleDisconnectTime:
 func (client *WANPPPConnection1) GetIdleDisconnectTime() (NewIdleDisconnectTime uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5839,11 +5051,6 @@ func (client *WANPPPConnection1) GetIdleDisconnectTime() (NewIdleDisconnectTime
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewWarnDisconnectDelay:
 func (client *WANPPPConnection1) GetWarnDisconnectDelay() (NewWarnDisconnectDelay uint32, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5870,13 +5077,6 @@ func (client *WANPPPConnection1) GetWarnDisconnectDelay() (NewWarnDisconnectDela
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewRSIPAvailable:
-//
-// * NewNATEnabled:
 func (client *WANPPPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNATEnabled bool, err error) {
 	// Request structure.
 	request := interface{}(nil)
@@ -5908,27 +5108,10 @@ func (client *WANPPPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewN
 	return
 }
 
-// Arguments:
-//
-// * NewPortMappingIndex:
 //
 // Return values:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
 func (client *WANPPPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex uint16) (NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -5995,25 +5178,11 @@ func (client *WANPPPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// Return values:
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
+
 func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32, err error) {
 	// Request structure.
 	request := &struct {
@@ -6075,25 +5244,11 @@ func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost strin
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-// * NewInternalPort:
-//
-// * NewInternalClient:
-//
-// * NewEnabled:
-//
-// * NewPortMappingDescription:
-//
-// * NewLeaseDuration:
-//
-//
+
 func (client *WANPPPConnection1) AddPortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string, NewInternalPort uint16, NewInternalClient string, NewEnabled bool, NewPortMappingDescription string, NewLeaseDuration uint32) (err error) {
 	// Request structure.
 	request := &struct {
@@ -6155,15 +5310,11 @@ func (client *WANPPPConnection1) AddPortMapping(NewRemoteHost string, NewExterna
 	return
 }
 
+//
 // Arguments:
 //
-// * NewRemoteHost:
-//
-// * NewExternalPort:
-//
 // * NewProtocol: allowed values: TCP, UDP
-//
-//
+
 func (client *WANPPPConnection1) DeletePortMapping(NewRemoteHost string, NewExternalPort uint16, NewProtocol string) (err error) {
 	// Request structure.
 	request := &struct {
@@ -6200,11 +5351,6 @@ func (client *WANPPPConnection1) DeletePortMapping(NewRemoteHost string, NewExte
 	return
 }
 
-//
-//
-// Return values:
-//
-// * NewExternalIPAddress:
 func (client *WANPPPConnection1) GetExternalIPAddress() (NewExternalIPAddress string, err error) {
 	// Request structure.
 	request := interface{}(nil)
diff --git a/gotasks/specgen_task.go b/gotasks/specgen_task.go
index 5dfd4da..921e8c8 100644
--- a/gotasks/specgen_task.go
+++ b/gotasks/specgen_task.go
@@ -275,7 +275,19 @@ type SCPDWithURN struct {
 	SCPD *scpd.SCPD
 }
 
-func (s *SCPDWithURN) WrapArgument(arg scpd.Argument) (*argumentWrapper, error) {
+func (s *SCPDWithURN) WrapArguments(args []*scpd.Argument) (argumentWrapperList, error) {
+	wrappedArgs := make(argumentWrapperList, len(args))
+	for i, arg := range args {
+		wa, err := s.wrapArgument(arg)
+		if err != nil {
+			return nil, err
+		}
+		wrappedArgs[i] = wa
+	}
+	return wrappedArgs, nil
+}
+
+func (s *SCPDWithURN) wrapArgument(arg *scpd.Argument) (*argumentWrapper, error) {
 	relVar := s.SCPD.GetStateVariable(arg.RelatedStateVariable)
 	if relVar == nil {
 		return nil, fmt.Errorf("no such state variable: %q, for argument %q", arg.RelatedStateVariable, arg.Name)
@@ -285,7 +297,7 @@ func (s *SCPDWithURN) WrapArgument(arg scpd.Argument) (*argumentWrapper, error)
 		return nil, fmt.Errorf("unknown data type: %q, for state variable %q, for argument %q", relVar.DataType.Type, arg.RelatedStateVariable, arg.Name)
 	}
 	return &argumentWrapper{
-		Argument: arg,
+		Argument: *arg,
 		relVar:   relVar,
 		conv:     cnv,
 	}, nil
@@ -301,6 +313,12 @@ func (arg *argumentWrapper) AsParameter() string {
 	return fmt.Sprintf("%s %s", arg.Name, arg.conv.ExtType)
 }
 
+func (arg *argumentWrapper) HasDoc() bool {
+	rng := arg.relVar.AllowedValueRange
+	return ((rng != nil && (rng.Minimum != "" || rng.Maximum != "" || rng.Step != "")) ||
+		len(arg.relVar.AllowedValues) > 0)
+}
+
 func (arg *argumentWrapper) Document() string {
 	relVar := arg.relVar
 	if rng := relVar.AllowedValueRange; rng != nil {
@@ -330,6 +348,17 @@ func (arg *argumentWrapper) Unmarshal(objVar string) string {
 	return fmt.Sprintf("soap.Unmarshal%s(%s.%s)", arg.conv.FuncSuffix, objVar, arg.Name)
 }
 
+type argumentWrapperList []*argumentWrapper
+
+func (args argumentWrapperList) HasDoc() bool {
+	for _, arg := range args {
+		if arg.HasDoc() {
+			return true
+		}
+	}
+	return false
+}
+
 type conv struct {
 	FuncSuffix string
 	ExtType    string
@@ -524,29 +553,33 @@ func new{{$srvIdent}}ClientsFromGenericClients(genericClients []goupnp.ServiceCl
 
 {{range .SCPD.Actions}}{{/* loops over *SCPDWithURN values */}}
 
-{{$inargs := .InputArguments}}{{$outargs := .OutputArguments}}
-// {{if $inargs}}Arguments:{{range $inargs}}{{$argWrap := $srv.WrapArgument .}}
+{{$winargs := $srv.WrapArguments .InputArguments}}
+{{$woutargs := $srv.WrapArguments .OutputArguments}}
+{{if $winargs.HasDoc}}
 //
-// * {{.Name}}: {{$argWrap.Document}}{{end}}{{end}}
+// Arguments:{{range $winargs}}{{if .HasDoc}}
 //
-// {{if $outargs}}Return values:{{range $outargs}}{{$argWrap := $srv.WrapArgument .}}
+// * {{.Name}}: {{.Document}}{{end}}{{end}}{{end}}
+{{if $woutargs.HasDoc}}
 //
-// * {{.Name}}: {{$argWrap.Document}}{{end}}{{end}}
-func (client *{{$srvIdent}}) {{.Name}}({{range $inargs}}{{/*
-*/}}{{$argWrap := $srv.WrapArgument .}}{{$argWrap.AsParameter}}, {{end}}{{/*
-*/}}) ({{range $outargs}}{{/*
-*/}}{{$argWrap := $srv.WrapArgument .}}{{$argWrap.AsParameter}}, {{end}} err error) {
+// Return values:{{range $woutargs}}{{if .HasDoc}}
+//
+// * {{.Name}}: {{.Document}}{{end}}{{end}}{{end}}
+func (client *{{$srvIdent}}) {{.Name}}({{range $winargs}}{{/*
+*/}}{{.AsParameter}}, {{end}}{{/*
+*/}}) ({{range $woutargs}}{{/*
+*/}}{{.AsParameter}}, {{end}} err error) {
 	// Request structure.
-	request := {{if $inargs}}&{{template "argstruct" $inargs}}{{"{}"}}{{else}}{{"interface{}(nil)"}}{{end}}
+	request := {{if $winargs}}&{{template "argstruct" $winargs}}{{"{}"}}{{else}}{{"interface{}(nil)"}}{{end}}
 	// BEGIN Marshal arguments into request.
-{{range $inargs}}{{$argWrap := $srv.WrapArgument .}}
-	if request.{{.Name}}, err = {{$argWrap.Marshal}}; err != nil {
+{{range $winargs}}
+	if request.{{.Name}}, err = {{.Marshal}}; err != nil {
 		return
 	}{{end}}
 	// END Marshal arguments into request.
 
 	// Response structure.
-	response := {{if $outargs}}&{{template "argstruct" $outargs}}{{"{}"}}{{else}}{{"interface{}(nil)"}}{{end}}
+	response := {{if $woutargs}}&{{template "argstruct" $woutargs}}{{"{}"}}{{else}}{{"interface{}(nil)"}}{{end}}
 
 	// Perform the SOAP call.
 	if err = client.SOAPClient.PerformAction({{$srv.URNParts.Const}}, "{{.Name}}", request, response); err != nil {
@@ -554,8 +587,8 @@ func (client *{{$srvIdent}}) {{.Name}}({{range $inargs}}{{/*
 	}
 
 	// BEGIN Unmarshal arguments from response.
-{{range $outargs}}{{$argWrap := $srv.WrapArgument .}}
-	if {{.Name}}, err = {{$argWrap.Unmarshal "response"}}; err != nil {
+{{range $woutargs}}
+	if {{.Name}}, err = {{.Unmarshal "response"}}; err != nil {
 		return
 	}{{end}}
 	// END Unmarshal arguments from response.