Omit message factory and line numbers from generated output

Change-Id: Ie48cc0a641242625daf55caf00ab630e78aa86b7
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>

13 files changed, 105 insertions, 1121 deletions

diff --git a/.gitignore b/.gitignore
index ec02bba..c10a9ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,15 @@
 .idea
+
+# cmds
 cmd/binapi-generator/binapi-generator
+
+# examples
+examples/cmd/perf-bench/perf-bench
 examples/cmd/simple-client/simple-client
 examples/cmd/stats-client/stats-client
-examples/cmd/perf-bench/perf-bench
+
+# extras
+extras/libmemif/examples/gopacket/gopacket
+extras/libmemif/examples/icmp-responder/icmp-responder
+extras/libmemif/examples/jumbo-frames/jumbo-frames
+extras/libmemif/examples/raw-data/raw-data
diff --git a/Makefile b/Makefile
index ea1daf6..ec01313 100644
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,52 @@
-build:
-	@cd cmd/binapi-generator && go build -v
-	@cd examples/cmd/simple-client && go build -v
-	@cd examples/cmd/stats-client && go build -v
-	@cd examples/cmd/perf-bench && go build -v
+VERSION ?= $(shell git describe --always --tags --dirty)
 
-test:
-	@cd cmd/binapi-generator && go test -cover .
-	@cd core && go test -cover .
+all: test build examples
 
 install:
-	@cd cmd/binapi-generator && go install -v
+	@echo "=> installing ${VERSION}"
+	go install ./cmd/binapi-generator
+
+build:
+	@echo "=> building ${VERSION}"
+	cd cmd/binapi-generator && go build -v
+
+examples:
+	@echo "=> building examples"
+	cd examples/cmd/simple-client && go build -v
+	cd examples/cmd/stats-client && go build -v
+	cd examples/cmd/perf-bench && go build -v
+
+test:
+	@echo "=> testing"
+	go test -cover ./cmd/...
+	go test -cover ./core ./api ./codec
 
 extras:
-	@cd extras/libmemif/examples/raw-data && go build -v
-	@cd extras/libmemif/examples/icmp-responder && go build -v
-	@cd extras/libmemif/examples/gopacket && go build -v
-	@cd extras/libmemif/examples/jumbo-frames && go build -v
+	@echo "=> building extras"
+	cd extras/libmemif/examples/gopacket && go build -v
+	cd extras/libmemif/examples/icmp-responder && go build -v
+	cd extras/libmemif/examples/jumbo-frames && go build -v
+	cd extras/libmemif/examples/raw-data && go build -v
 
 clean:
-	@rm -f cmd/binapi-generator/binapi-generator
-	@rm -f examples/cmd/simple-client/simple-client
-	@rm -f examples/cmd/stats-client/stats-client
-	@rm -f examples/cmd/perf-bench/perf-bench
-	@rm -f extras/libmemif/examples/raw-data/raw-data
-	@rm -f extras/libmemif/examples/icmp-responder/icmp-responder
+	@echo "=> cleaning"
+	rm -f cmd/binapi-generator/binapi-generator
+	rm -f examples/cmd/perf-bench/perf-bench
+	rm -f examples/cmd/simple-client/simple-client
+	rm -f examples/cmd/stats-client/stats-client
+	rm -f extras/libmemif/examples/gopacket/gopacket
+	rm -f extras/libmemif/examples/icmp-responder/icmp-responder
+	rm -f extras/libmemif/examples/jumbo-frames/jumbo-frames
+	rm -f extras/libmemif/examples/raw-data/raw-data
 
-generate:
-	@cd examples && go generate ./...
+generate: install
+	@echo "=> generating code"
+	cd examples && go generate ./...
 
 lint:
+	@echo "=> running linter"
 	@golint ./... | grep -v vendor | grep -v bin_api || true
 
-.PHONY: build test install extras clean generate
+.PHONY: all \
+	install build examples test \
+	extras clean generate lint
diff --git a/cmd/binapi-generator/generate.go b/cmd/binapi-generator/generate.go
index 73bcd2a..7cfe338 100644
--- a/cmd/binapi-generator/generate.go
+++ b/cmd/binapi-generator/generate.go
@@ -171,23 +171,19 @@ func generatePackage(ctx *context, w *bufio.Writer) error {
 // generateHeader writes generated package header into w
 func generateHeader(ctx *context, w io.Writer) {
 	fmt.Fprintln(w, "// Code generated by GoVPP binapi-generator. DO NOT EDIT.")
-	fmt.Fprintf(w, "// source: %s\n", ctx.inputFile)
+	fmt.Fprintf(w, "//  source: %s\n", ctx.inputFile)
 	fmt.Fprintln(w)
 
 	fmt.Fprintln(w, "/*")
-	fmt.Fprintf(w, "Package %s is a generated VPP binary API of the '%s' VPP module.\n", ctx.packageName, ctx.moduleName)
+	fmt.Fprintf(w, " Package %s is a generated from VPP binary API module '%s'.\n", ctx.packageName, ctx.moduleName)
 	fmt.Fprintln(w)
-	fmt.Fprintln(w, "It is generated from this file:")
-	fmt.Fprintf(w, "\t%s\n", filepath.Base(ctx.inputFile))
-	fmt.Fprintln(w)
-	fmt.Fprintln(w, "It contains these VPP binary API objects:")
-
+	fmt.Fprintln(w, " It contains following objects:")
 	var printObjNum = func(obj string, num int) {
 		if num > 0 {
 			if num > 1 {
 				obj += "s"
 			}
-			fmt.Fprintf(w, "\t%d %s\n", num, obj)
+			fmt.Fprintf(w, "\t%3d %s\n", num, obj)
 		}
 	}
 	printObjNum("message", len(ctx.packageData.Messages))
@@ -195,7 +191,7 @@ func generateHeader(ctx *context, w io.Writer) {
 	printObjNum("enum", len(ctx.packageData.Enums))
 	printObjNum("union", len(ctx.packageData.Unions))
 	printObjNum("service", len(ctx.packageData.Services))
-
+	fmt.Fprintln(w)
 	fmt.Fprintln(w, "*/")
 	fmt.Fprintf(w, "package %s\n", ctx.packageName)
 	fmt.Fprintln(w)
@@ -242,7 +238,6 @@ func generateComment(ctx *context, w io.Writer, goName string, vppName string, o
 			// If no other non-whitespace character then we are at the message header.
 			if trimmed := strings.TrimSpace(line); trimmed == objTitle {
 				objFound = true
-				fmt.Fprintf(w, "// Generated from '%s', line %d:\n", filepath.Base(ctx.inputFile), ctx.inputLine)
 				fmt.Fprintln(w, "//")
 			}
 		} else {
@@ -463,9 +458,6 @@ func generateMessage(ctx *context, w io.Writer, msg *Message) {
 
 	// generate message type getter method
 	generateMessageTypeGetter(w, name, msgType)
-
-	// generate message factory
-	generateMessageFactory(w, name)
 }
 
 // generateField writes generated code for the field into w
@@ -556,10 +548,3 @@ func generateMessageTypeGetter(w io.Writer, structName string, msgType MessageTy
 	}
 	fmt.Fprintln(w, "}")
 }
-
-// generateMessageFactory generates message factory for the generated message into the provider writer
-func generateMessageFactory(w io.Writer, structName string) {
-	fmt.Fprintln(w, "func New"+structName+"() api.Message {")
-	fmt.Fprintln(w, "\treturn &"+structName+"{}")
-	fmt.Fprintln(w, "}")
-}
diff --git a/core/channel_test.go b/core/channel_test.go
index 0eafa32..b06e3e9 100644
--- a/core/channel_test.go
+++ b/core/channel_test.go
@@ -22,7 +22,7 @@ import (
 	"git.fd.io/govpp.git/examples/bin_api/interfaces"
 	"git.fd.io/govpp.git/examples/bin_api/memif"
 	"git.fd.io/govpp.git/examples/bin_api/tap"
-	"git.fd.io/govpp.git/examples/binapi/vpe"
+	"git.fd.io/govpp.git/examples/bin_api/vpe"
 
 	"git.fd.io/govpp.git/api"
 	. "github.com/onsi/gomega"
diff --git a/core/connection_test.go b/core/connection_test.go
index cea7d2d..2ecdd34 100644
--- a/core/connection_test.go
+++ b/core/connection_test.go
@@ -22,8 +22,8 @@ import (
 	"git.fd.io/govpp.git/codec"
 	"git.fd.io/govpp.git/core"
 	"git.fd.io/govpp.git/examples/bin_api/interfaces"
-	"git.fd.io/govpp.git/examples/binapi/stats"
-	"git.fd.io/govpp.git/examples/binapi/vpe"
+	"git.fd.io/govpp.git/examples/bin_api/stats"
+	"git.fd.io/govpp.git/examples/bin_api/vpe"
 	. "github.com/onsi/gomega"
 )
 
diff --git a/examples/bin_api/acl/acl.ba.go b/examples/bin_api/acl/acl.ba.go
index 0dfd335..47b79cf 100644
--- a/examples/bin_api/acl/acl.ba.go
+++ b/examples/bin_api/acl/acl.ba.go
@@ -1,16 +1,14 @@
 // Code generated by GoVPP binapi-generator. DO NOT EDIT.
-// source: acl.api.json
+//  source: acl.api.json
 
 /*
-Package acl is a generated VPP binary API of the 'acl' VPP module.
+ Package acl is a generated from VPP binary API module 'acl'.
 
-It is generated from this file:
-	acl.api.json
+ It contains following objects:
+	 34 messages
+	  2 types
+	 17 services
 
-It contains these VPP binary API objects:
-	34 messages
-	2 types
-	17 services
 */
 package acl
 
@@ -26,7 +24,6 @@ var _ = bytes.NewBuffer
 /* Types */
 
 // ACLRule represents the VPP binary API type 'acl_rule'.
-// Generated from 'acl.api.json', line 922:
 //
 //            "acl_rule",
 //            [
@@ -111,7 +108,6 @@ func (*ACLRule) GetCrcString() string {
 }
 
 // MacipACLRule represents the VPP binary API type 'macip_acl_rule'.
-// Generated from 'acl.api.json', line 982:
 //
 //            "macip_acl_rule",
 //            [
@@ -164,7 +160,6 @@ func (*MacipACLRule) GetCrcString() string {
 /* Messages */
 
 // ACLPluginGetVersion represents the VPP binary API message 'acl_plugin_get_version'.
-// Generated from 'acl.api.json', line 4:
 //
 //            "acl_plugin_get_version",
 //            [
@@ -194,12 +189,8 @@ func (*ACLPluginGetVersion) GetCrcString() string {
 func (*ACLPluginGetVersion) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewACLPluginGetVersion() api.Message {
-	return &ACLPluginGetVersion{}
-}
 
 // ACLPluginGetVersionReply represents the VPP binary API message 'acl_plugin_get_version_reply'.
-// Generated from 'acl.api.json', line 22:
 //
 //            "acl_plugin_get_version_reply",
 //            [
@@ -236,12 +227,8 @@ func (*ACLPluginGetVersionReply) GetCrcString() string {
 func (*ACLPluginGetVersionReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewACLPluginGetVersionReply() api.Message {
-	return &ACLPluginGetVersionReply{}
-}
 
 // ACLPluginControlPing represents the VPP binary API message 'acl_plugin_control_ping'.
-// Generated from 'acl.api.json', line 44:
 //
 //            "acl_plugin_control_ping",
 //            [
@@ -271,12 +258,8 @@ func (*ACLPluginControlPing) GetCrcString() string {
 func (*ACLPluginControlPing) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewACLPluginControlPing() api.Message {
-	return &ACLPluginControlPing{}
-}
 
 // ACLPluginControlPingReply represents the VPP binary API message 'acl_plugin_control_ping_reply'.
-// Generated from 'acl.api.json', line 62:
 //
 //            "acl_plugin_control_ping_reply",
 //            [
@@ -318,12 +301,8 @@ func (*ACLPluginControlPingReply) GetCrcString() string {
 func (*ACLPluginControlPingReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewACLPluginControlPingReply() api.Message {
-	return &ACLPluginControlPingReply{}
-}
 
 // ACLAddReplace represents the VPP binary API message 'acl_add_replace'.
-// Generated from 'acl.api.json', line 88:
 //
 //            "acl_add_replace",
 //            [
@@ -377,12 +356,8 @@ func (*ACLAddReplace) GetCrcString() string {
 func (*ACLAddReplace) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewACLAddReplace() api.Message {
-	return &ACLAddReplace{}
-}
 
 // ACLAddReplaceReply represents the VPP binary API message 'acl_add_replace_reply'.
-// Generated from 'acl.api.json', line 125:
 //
 //            "acl_add_replace_reply",
 //            [
@@ -419,12 +394,8 @@ func (*ACLAddReplaceReply) GetCrcString() string {
 func (*ACLAddReplaceReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewACLAddReplaceReply() api.Message {
-	return &ACLAddReplaceReply{}
-}
 
 // ACLDel represents the VPP binary API message 'acl_del'.
-// Generated from 'acl.api.json', line 147:
 //
 //            "acl_del",
 //            [
@@ -460,12 +431,8 @@ func (*ACLDel) GetCrcString() string {
 func (*ACLDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewACLDel() api.Message {
-	return &ACLDel{}
-}
 
 // ACLDelReply represents the VPP binary API message 'acl_del_reply'.
-// Generated from 'acl.api.json', line 169:
 //
 //            "acl_del_reply",
 //            [
@@ -497,12 +464,8 @@ func (*ACLDelReply) GetCrcString() string {
 func (*ACLDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewACLDelReply() api.Message {
-	return &ACLDelReply{}
-}
 
 // ACLInterfaceAddDel represents the VPP binary API message 'acl_interface_add_del'.
-// Generated from 'acl.api.json', line 187:
 //
 //            "acl_interface_add_del",
 //            [
@@ -553,12 +516,8 @@ func (*ACLInterfaceAddDel) GetCrcString() string {
 func (*ACLInterfaceAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewACLInterfaceAddDel() api.Message {
-	return &ACLInterfaceAddDel{}
-}
 
 // ACLInterfaceAddDelReply represents the VPP binary API message 'acl_interface_add_del_reply'.
-// Generated from 'acl.api.json', line 221:
 //
 //            "acl_interface_add_del_reply",
 //            [
@@ -590,12 +549,8 @@ func (*ACLInterfaceAddDelReply) GetCrcString() string {
 func (*ACLInterfaceAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewACLInterfaceAddDelReply() api.Message {
-	return &ACLInterfaceAddDelReply{}
-}
 
 // ACLInterfaceSetACLList represents the VPP binary API message 'acl_interface_set_acl_list'.
-// Generated from 'acl.api.json', line 239:
 //
 //            "acl_interface_set_acl_list",
 //            [
@@ -648,12 +603,8 @@ func (*ACLInterfaceSetACLList) GetCrcString() string {
 func (*ACLInterfaceSetACLList) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewACLInterfaceSetACLList() api.Message {
-	return &ACLInterfaceSetACLList{}
-}
 
 // ACLInterfaceSetACLListReply represents the VPP binary API message 'acl_interface_set_acl_list_reply'.
-// Generated from 'acl.api.json', line 275:
 //
 //            "acl_interface_set_acl_list_reply",
 //            [
@@ -685,12 +636,8 @@ func (*ACLInterfaceSetACLListReply) GetCrcString() string {
 func (*ACLInterfaceSetACLListReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewACLInterfaceSetACLListReply() api.Message {
-	return &ACLInterfaceSetACLListReply{}
-}
 
 // ACLDump represents the VPP binary API message 'acl_dump'.
-// Generated from 'acl.api.json', line 293:
 //
 //            "acl_dump",
 //            [
@@ -726,12 +673,8 @@ func (*ACLDump) GetCrcString() string {
 func (*ACLDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewACLDump() api.Message {
-	return &ACLDump{}
-}
 
 // ACLDetails represents the VPP binary API message 'acl_details'.
-// Generated from 'acl.api.json', line 315:
 //
 //            "acl_details",
 //            [
@@ -781,12 +724,8 @@ func (*ACLDetails) GetCrcString() string {
 func (*ACLDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewACLDetails() api.Message {
-	return &ACLDetails{}
-}
 
 // ACLInterfaceListDump represents the VPP binary API message 'acl_interface_list_dump'.
-// Generated from 'acl.api.json', line 348:
 //
 //            "acl_interface_list_dump",
 //            [
@@ -822,12 +761,8 @@ func (*ACLInterfaceListDump) GetCrcString() string {
 func (*ACLInterfaceListDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewACLInterfaceListDump() api.Message {
-	return &ACLInterfaceListDump{}
-}
 
 // ACLInterfaceListDetails represents the VPP binary API message 'acl_interface_list_details'.
-// Generated from 'acl.api.json', line 370:
 //
 //            "acl_interface_list_details",
 //            [
@@ -876,12 +811,8 @@ func (*ACLInterfaceListDetails) GetCrcString() string {
 func (*ACLInterfaceListDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewACLInterfaceListDetails() api.Message {
-	return &ACLInterfaceListDetails{}
-}
 
 // MacipACLAdd represents the VPP binary API message 'macip_acl_add'.
-// Generated from 'acl.api.json', line 402:
 //
 //            "macip_acl_add",
 //            [
@@ -930,12 +861,8 @@ func (*MacipACLAdd) GetCrcString() string {
 func (*MacipACLAdd) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMacipACLAdd() api.Message {
-	return &MacipACLAdd{}
-}
 
 // MacipACLAddReply represents the VPP binary API message 'macip_acl_add_reply'.
-// Generated from 'acl.api.json', line 435:
 //
 //            "macip_acl_add_reply",
 //            [
@@ -972,12 +899,8 @@ func (*MacipACLAddReply) GetCrcString() string {
 func (*MacipACLAddReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewMacipACLAddReply() api.Message {
-	return &MacipACLAddReply{}
-}
 
 // MacipACLAddReplace represents the VPP binary API message 'macip_acl_add_replace'.
-// Generated from 'acl.api.json', line 457:
 //
 //            "macip_acl_add_replace",
 //            [
@@ -1031,12 +954,8 @@ func (*MacipACLAddReplace) GetCrcString() string {
 func (*MacipACLAddReplace) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMacipACLAddReplace() api.Message {
-	return &MacipACLAddReplace{}
-}
 
 // MacipACLAddReplaceReply represents the VPP binary API message 'macip_acl_add_replace_reply'.
-// Generated from 'acl.api.json', line 494:
 //
 //            "macip_acl_add_replace_reply",
 //            [
@@ -1073,12 +992,8 @@ func (*MacipACLAddReplaceReply) GetCrcString() string {
 func (*MacipACLAddReplaceReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewMacipACLAddReplaceReply() api.Message {
-	return &MacipACLAddReplaceReply{}
-}
 
 // MacipACLDel represents the VPP binary API message 'macip_acl_del'.
-// Generated from 'acl.api.json', line 516:
 //
 //            "macip_acl_del",
 //            [
@@ -1114,12 +1029,8 @@ func (*MacipACLDel) GetCrcString() string {
 func (*MacipACLDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMacipACLDel() api.Message {
-	return &MacipACLDel{}
-}
 
 // MacipACLDelReply represents the VPP binary API message 'macip_acl_del_reply'.
-// Generated from 'acl.api.json', line 538:
 //
 //            "macip_acl_del_reply",
 //            [
@@ -1151,12 +1062,8 @@ func (*MacipACLDelReply) GetCrcString() string {
 func (*MacipACLDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewMacipACLDelReply() api.Message {
-	return &MacipACLDelReply{}
-}
 
 // MacipACLInterfaceAddDel represents the VPP binary API message 'macip_acl_interface_add_del'.
-// Generated from 'acl.api.json', line 556:
 //
 //            "macip_acl_interface_add_del",
 //            [
@@ -1202,12 +1109,8 @@ func (*MacipACLInterfaceAddDel) GetCrcString() string {
 func (*MacipACLInterfaceAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMacipACLInterfaceAddDel() api.Message {
-	return &MacipACLInterfaceAddDel{}
-}
 
 // MacipACLInterfaceAddDelReply represents the VPP binary API message 'macip_acl_interface_add_del_reply'.
-// Generated from 'acl.api.json', line 586:
 //
 //            "macip_acl_interface_add_del_reply",
 //            [
@@ -1239,12 +1142,8 @@ func (*MacipACLInterfaceAddDelReply) GetCrcString() string {
 func (*MacipACLInterfaceAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewMacipACLInterfaceAddDelReply() api.Message {
-	return &MacipACLInterfaceAddDelReply{}
-}
 
 // MacipACLDump represents the VPP binary API message 'macip_acl_dump'.
-// Generated from 'acl.api.json', line 604:
 //
 //            "macip_acl_dump",
 //            [
@@ -1280,12 +1179,8 @@ func (*MacipACLDump) GetCrcString() string {
 func (*MacipACLDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMacipACLDump() api.Message {
-	return &MacipACLDump{}
-}
 
 // MacipACLDetails represents the VPP binary API message 'macip_acl_details'.
-// Generated from 'acl.api.json', line 626:
 //
 //            "macip_acl_details",
 //            [
@@ -1335,12 +1230,8 @@ func (*MacipACLDetails) GetCrcString() string {
 func (*MacipACLDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewMacipACLDetails() api.Message {
-	return &MacipACLDetails{}
-}
 
 // MacipACLInterfaceGet represents the VPP binary API message 'macip_acl_interface_get'.
-// Generated from 'acl.api.json', line 659:
 //
 //            "macip_acl_interface_get",
 //            [
@@ -1370,12 +1261,8 @@ func (*MacipACLInterfaceGet) GetCrcString() string {
 func (*MacipACLInterfaceGet) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMacipACLInterfaceGet() api.Message {
-	return &MacipACLInterfaceGet{}
-}
 
 // MacipACLInterfaceGetReply represents the VPP binary API message 'macip_acl_interface_get_reply'.
-// Generated from 'acl.api.json', line 677:
 //
 //            "macip_acl_interface_get_reply",
 //            [
@@ -1414,12 +1301,8 @@ func (*MacipACLInterfaceGetReply) GetCrcString() string {
 func (*MacipACLInterfaceGetReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewMacipACLInterfaceGetReply() api.Message {
-	return &MacipACLInterfaceGetReply{}
-}
 
 // MacipACLInterfaceListDump represents the VPP binary API message 'macip_acl_interface_list_dump'.
-// Generated from 'acl.api.json', line 701:
 //
 //            "macip_acl_interface_list_dump",
 //            [
@@ -1455,12 +1338,8 @@ func (*MacipACLInterfaceListDump) GetCrcString() string {
 func (*MacipACLInterfaceListDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMacipACLInterfaceListDump() api.Message {
-	return &MacipACLInterfaceListDump{}
-}
 
 // MacipACLInterfaceListDetails represents the VPP binary API message 'macip_acl_interface_list_details'.
-// Generated from 'acl.api.json', line 723:
 //
 //            "macip_acl_interface_list_details",
 //            [
@@ -1504,12 +1383,8 @@ func (*MacipACLInterfaceListDetails) GetCrcString() string {
 func (*MacipACLInterfaceListDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewMacipACLInterfaceListDetails() api.Message {
-	return &MacipACLInterfaceListDetails{}
-}
 
 // ACLInterfaceSetEtypeWhitelist represents the VPP binary API message 'acl_interface_set_etype_whitelist'.
-// Generated from 'acl.api.json', line 751:
 //
 //            "acl_interface_set_etype_whitelist",
 //            [
@@ -1562,12 +1437,8 @@ func (*ACLInterfaceSetEtypeWhitelist) GetCrcString() string {
 func (*ACLInterfaceSetEtypeWhitelist) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewACLInterfaceSetEtypeWhitelist() api.Message {
-	return &ACLInterfaceSetEtypeWhitelist{}
-}
 
 // ACLInterfaceSetEtypeWhitelistReply represents the VPP binary API message 'acl_interface_set_etype_whitelist_reply'.
-// Generated from 'acl.api.json', line 787:
 //
 //            "acl_interface_set_etype_whitelist_reply",
 //            [
@@ -1599,12 +1470,8 @@ func (*ACLInterfaceSetEtypeWhitelistReply) GetCrcString() string {
 func (*ACLInterfaceSetEtypeWhitelistReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewACLInterfaceSetEtypeWhitelistReply() api.Message {
-	return &ACLInterfaceSetEtypeWhitelistReply{}
-}
 
 // ACLInterfaceEtypeWhitelistDump represents the VPP binary API message 'acl_interface_etype_whitelist_dump'.
-// Generated from 'acl.api.json', line 805:
 //
 //            "acl_interface_etype_whitelist_dump",
 //            [
@@ -1640,12 +1507,8 @@ func (*ACLInterfaceEtypeWhitelistDump) GetCrcString() string {
 func (*ACLInterfaceEtypeWhitelistDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewACLInterfaceEtypeWhitelistDump() api.Message {
-	return &ACLInterfaceEtypeWhitelistDump{}
-}
 
 // ACLInterfaceEtypeWhitelistDetails represents the VPP binary API message 'acl_interface_etype_whitelist_details'.
-// Generated from 'acl.api.json', line 827:
 //
 //            "acl_interface_etype_whitelist_details",
 //            [
@@ -1694,9 +1557,6 @@ func (*ACLInterfaceEtypeWhitelistDetails) GetCrcString() string {
 func (*ACLInterfaceEtypeWhitelistDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewACLInterfaceEtypeWhitelistDetails() api.Message {
-	return &ACLInterfaceEtypeWhitelistDetails{}
-}
 
 /* Services */
 
diff --git a/examples/bin_api/af_packet/af_packet.ba.go b/examples/bin_api/af_packet/af_packet.ba.go
index 144bf74..81c2b9d 100644
--- a/examples/bin_api/af_packet/af_packet.ba.go
+++ b/examples/bin_api/af_packet/af_packet.ba.go
@@ -1,15 +1,13 @@
 // Code generated by GoVPP binapi-generator. DO NOT EDIT.
-// source: af_packet.api.json
+//  source: af_packet.api.json
 
 /*
-Package af_packet is a generated VPP binary API of the 'af_packet' VPP module.
+ Package af_packet is a generated from VPP binary API module 'af_packet'.
 
-It is generated from this file:
-	af_packet.api.json
+ It contains following objects:
+	  8 messages
+	  4 services
 
-It contains these VPP binary API objects:
-	8 messages
-	4 services
 */
 package af_packet
 
@@ -25,7 +23,6 @@ var _ = bytes.NewBuffer
 /* Messages */
 
 // AfPacketCreate represents the VPP binary API message 'af_packet_create'.
-// Generated from 'af_packet.api.json', line 4:
 //
 //            "af_packet_create",
 //            [
@@ -73,12 +70,8 @@ func (*AfPacketCreate) GetCrcString() string {
 func (*AfPacketCreate) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewAfPacketCreate() api.Message {
-	return &AfPacketCreate{}
-}
 
 // AfPacketCreateReply represents the VPP binary API message 'af_packet_create_reply'.
-// Generated from 'af_packet.api.json', line 36:
 //
 //            "af_packet_create_reply",
 //            [
@@ -115,12 +108,8 @@ func (*AfPacketCreateReply) GetCrcString() string {
 func (*AfPacketCreateReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewAfPacketCreateReply() api.Message {
-	return &AfPacketCreateReply{}
-}
 
 // AfPacketDelete represents the VPP binary API message 'af_packet_delete'.
-// Generated from 'af_packet.api.json', line 58:
 //
 //            "af_packet_delete",
 //            [
@@ -157,12 +146,8 @@ func (*AfPacketDelete) GetCrcString() string {
 func (*AfPacketDelete) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewAfPacketDelete() api.Message {
-	return &AfPacketDelete{}
-}
 
 // AfPacketDeleteReply represents the VPP binary API message 'af_packet_delete_reply'.
-// Generated from 'af_packet.api.json', line 81:
 //
 //            "af_packet_delete_reply",
 //            [
@@ -194,12 +179,8 @@ func (*AfPacketDeleteReply) GetCrcString() string {
 func (*AfPacketDeleteReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewAfPacketDeleteReply() api.Message {
-	return &AfPacketDeleteReply{}
-}
 
 // AfPacketSetL4CksumOffload represents the VPP binary API message 'af_packet_set_l4_cksum_offload'.
-// Generated from 'af_packet.api.json', line 99:
 //
 //            "af_packet_set_l4_cksum_offload",
 //            [
@@ -240,12 +221,8 @@ func (*AfPacketSetL4CksumOffload) GetCrcString() string {
 func (*AfPacketSetL4CksumOffload) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewAfPacketSetL4CksumOffload() api.Message {
-	return &AfPacketSetL4CksumOffload{}
-}
 
 // AfPacketSetL4CksumOffloadReply represents the VPP binary API message 'af_packet_set_l4_cksum_offload_reply'.
-// Generated from 'af_packet.api.json', line 125:
 //
 //            "af_packet_set_l4_cksum_offload_reply",
 //            [
@@ -277,12 +254,8 @@ func (*AfPacketSetL4CksumOffloadReply) GetCrcString() string {
 func (*AfPacketSetL4CksumOffloadReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewAfPacketSetL4CksumOffloadReply() api.Message {
-	return &AfPacketSetL4CksumOffloadReply{}
-}
 
 // AfPacketDump represents the VPP binary API message 'af_packet_dump'.
-// Generated from 'af_packet.api.json', line 143:
 //
 //            "af_packet_dump",
 //            [
@@ -312,12 +285,8 @@ func (*AfPacketDump) GetCrcString() string {
 func (*AfPacketDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewAfPacketDump() api.Message {
-	return &AfPacketDump{}
-}
 
 // AfPacketDetails represents the VPP binary API message 'af_packet_details'.
-// Generated from 'af_packet.api.json', line 161:
 //
 //            "af_packet_details",
 //            [
@@ -355,9 +324,6 @@ func (*AfPacketDetails) GetCrcString() string {
 func (*AfPacketDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewAfPacketDetails() api.Message {
-	return &AfPacketDetails{}
-}
 
 /* Services */
 
diff --git a/examples/bin_api/interfaces/interfaces.ba.go b/examples/bin_api/interfaces/interfaces.ba.go
index 38bbb6b..6ab79d3 100644
--- a/examples/bin_api/interfaces/interfaces.ba.go
+++ b/examples/bin_api/interfaces/interfaces.ba.go
@@ -1,16 +1,14 @@
 // Code generated by GoVPP binapi-generator. DO NOT EDIT.
-// source: interface.api.json
+//  source: interface.api.json
 
 /*
-Package interfaces is a generated VPP binary API of the 'interface' VPP module.
+ Package interfaces is a generated from VPP binary API module 'interface'.
 
-It is generated from this file:
-	interface.api.json
+ It contains following objects:
+	 45 messages
+	  3 types
+	 22 services
 
-It contains these VPP binary API objects:
-	45 messages
-	3 types
-	22 services
 */
 package interfaces
 
@@ -26,7 +24,6 @@ var _ = bytes.NewBuffer
 /* Types */
 
 // VlibCounter represents the VPP binary API type 'vlib_counter'.
-// Generated from 'interface.api.json', line 1301:
 //
 //            "vlib_counter",
 //            [
@@ -54,7 +51,6 @@ func (*VlibCounter) GetCrcString() string {
 }
 
 // VnetCombinedCounter represents the VPP binary API type 'vnet_combined_counter'.
-// Generated from 'interface.api.json', line 1315:
 //
 //            "vnet_combined_counter",
 //            [
@@ -157,7 +153,6 @@ func (*VnetCombinedCounter) GetCrcString() string {
 }
 
 // VnetSimpleCounter represents the VPP binary API type 'vnet_simple_counter'.
-// Generated from 'interface.api.json', line 1389:
 //
 //            "vnet_simple_counter",
 //            [
@@ -227,7 +222,6 @@ func (*VnetSimpleCounter) GetCrcString() string {
 /* Messages */
 
 // SwInterfaceSetFlags represents the VPP binary API message 'sw_interface_set_flags'.
-// Generated from 'interface.api.json', line 4:
 //
 //            "sw_interface_set_flags",
 //            [
@@ -268,12 +262,8 @@ func (*SwInterfaceSetFlags) GetCrcString() string {
 func (*SwInterfaceSetFlags) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceSetFlags() api.Message {
-	return &SwInterfaceSetFlags{}
-}
 
 // SwInterfaceSetFlagsReply represents the VPP binary API message 'sw_interface_set_flags_reply'.
-// Generated from 'interface.api.json', line 30:
 //
 //            "sw_interface_set_flags_reply",
 //            [
@@ -305,12 +295,8 @@ func (*SwInterfaceSetFlagsReply) GetCrcString() string {
 func (*SwInterfaceSetFlagsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceSetFlagsReply() api.Message {
-	return &SwInterfaceSetFlagsReply{}
-}
 
 // HwInterfaceSetMtu represents the VPP binary API message 'hw_interface_set_mtu'.
-// Generated from 'interface.api.json', line 48:
 //
 //            "hw_interface_set_mtu",
 //            [
@@ -351,12 +337,8 @@ func (*HwInterfaceSetMtu) GetCrcString() string {
 func (*HwInterfaceSetMtu) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewHwInterfaceSetMtu() api.Message {
-	return &HwInterfaceSetMtu{}
-}
 
 // HwInterfaceSetMtuReply represents the VPP binary API message 'hw_interface_set_mtu_reply'.
-// Generated from 'interface.api.json', line 74:
 //
 //            "hw_interface_set_mtu_reply",
 //            [
@@ -388,12 +370,8 @@ func (*HwInterfaceSetMtuReply) GetCrcString() string {
 func (*HwInterfaceSetMtuReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewHwInterfaceSetMtuReply() api.Message {
-	return &HwInterfaceSetMtuReply{}
-}
 
 // SwInterfaceSetMtu represents the VPP binary API message 'sw_interface_set_mtu'.
-// Generated from 'interface.api.json', line 92:
 //
 //            "sw_interface_set_mtu",
 //            [
@@ -435,12 +413,8 @@ func (*SwInterfaceSetMtu) GetCrcString() string {
 func (*SwInterfaceSetMtu) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceSetMtu() api.Message {
-	return &SwInterfaceSetMtu{}
-}
 
 // SwInterfaceSetMtuReply represents the VPP binary API message 'sw_interface_set_mtu_reply'.
-// Generated from 'interface.api.json', line 119:
 //
 //            "sw_interface_set_mtu_reply",
 //            [
@@ -472,12 +446,8 @@ func (*SwInterfaceSetMtuReply) GetCrcString() string {
 func (*SwInterfaceSetMtuReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceSetMtuReply() api.Message {
-	return &SwInterfaceSetMtuReply{}
-}
 
 // SwInterfaceEvent represents the VPP binary API message 'sw_interface_event'.
-// Generated from 'interface.api.json', line 137:
 //
 //            "sw_interface_event",
 //            [
@@ -529,12 +499,8 @@ func (*SwInterfaceEvent) GetCrcString() string {
 func (*SwInterfaceEvent) GetMessageType() api.MessageType {
 	return api.EventMessage
 }
-func NewSwInterfaceEvent() api.Message {
-	return &SwInterfaceEvent{}
-}
 
 // WantInterfaceEvents represents the VPP binary API message 'want_interface_events'.
-// Generated from 'interface.api.json', line 171:
 //
 //            "want_interface_events",
 //            [
@@ -575,12 +541,8 @@ func (*WantInterfaceEvents) GetCrcString() string {
 func (*WantInterfaceEvents) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantInterfaceEvents() api.Message {
-	return &WantInterfaceEvents{}
-}
 
 // WantInterfaceEventsReply represents the VPP binary API message 'want_interface_events_reply'.
-// Generated from 'interface.api.json', line 197:
 //
 //            "want_interface_events_reply",
 //            [
@@ -612,12 +574,8 @@ func (*WantInterfaceEventsReply) GetCrcString() string {
 func (*WantInterfaceEventsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantInterfaceEventsReply() api.Message {
-	return &WantInterfaceEventsReply{}
-}
 
 // SwInterfaceDetails represents the VPP binary API message 'sw_interface_details'.
-// Generated from 'interface.api.json', line 215:
 //
 //            "sw_interface_details",
 //            [
@@ -805,12 +763,8 @@ func (*SwInterfaceDetails) GetCrcString() string {
 func (*SwInterfaceDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceDetails() api.Message {
-	return &SwInterfaceDetails{}
-}
 
 // SwInterfaceDump represents the VPP binary API message 'sw_interface_dump'.
-// Generated from 'interface.api.json', line 359:
 //
 //            "sw_interface_dump",
 //            [
@@ -852,12 +806,8 @@ func (*SwInterfaceDump) GetCrcString() string {
 func (*SwInterfaceDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceDump() api.Message {
-	return &SwInterfaceDump{}
-}
 
 // SwInterfaceAddDelAddress represents the VPP binary API message 'sw_interface_add_del_address'.
-// Generated from 'interface.api.json', line 386:
 //
 //            "sw_interface_add_del_address",
 //            [
@@ -919,12 +869,8 @@ func (*SwInterfaceAddDelAddress) GetCrcString() string {
 func (*SwInterfaceAddDelAddress) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceAddDelAddress() api.Message {
-	return &SwInterfaceAddDelAddress{}
-}
 
 // SwInterfaceAddDelAddressReply represents the VPP binary API message 'sw_interface_add_del_address_reply'.
-// Generated from 'interface.api.json', line 429:
 //
 //            "sw_interface_add_del_address_reply",
 //            [
@@ -956,12 +902,8 @@ func (*SwInterfaceAddDelAddressReply) GetCrcString() string {
 func (*SwInterfaceAddDelAddressReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceAddDelAddressReply() api.Message {
-	return &SwInterfaceAddDelAddressReply{}
-}
 
 // SwInterfaceSetTable represents the VPP binary API message 'sw_interface_set_table'.
-// Generated from 'interface.api.json', line 447:
 //
 //            "sw_interface_set_table",
 //            [
@@ -1007,12 +949,8 @@ func (*SwInterfaceSetTable) GetCrcString() string {
 func (*SwInterfaceSetTable) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceSetTable() api.Message {
-	return &SwInterfaceSetTable{}
-}
 
 // SwInterfaceSetTableReply represents the VPP binary API message 'sw_interface_set_table_reply'.
-// Generated from 'interface.api.json', line 477:
 //
 //            "sw_interface_set_table_reply",
 //            [
@@ -1044,12 +982,8 @@ func (*SwInterfaceSetTableReply) GetCrcString() string {
 func (*SwInterfaceSetTableReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceSetTableReply() api.Message {
-	return &SwInterfaceSetTableReply{}
-}
 
 // SwInterfaceGetTable represents the VPP binary API message 'sw_interface_get_table'.
-// Generated from 'interface.api.json', line 495:
 //
 //            "sw_interface_get_table",
 //            [
@@ -1090,12 +1024,8 @@ func (*SwInterfaceGetTable) GetCrcString() string {
 func (*SwInterfaceGetTable) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceGetTable() api.Message {
-	return &SwInterfaceGetTable{}
-}
 
 // SwInterfaceGetTableReply represents the VPP binary API message 'sw_interface_get_table_reply'.
-// Generated from 'interface.api.json', line 521:
 //
 //            "sw_interface_get_table_reply",
 //            [
@@ -1132,12 +1062,8 @@ func (*SwInterfaceGetTableReply) GetCrcString() string {
 func (*SwInterfaceGetTableReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceGetTableReply() api.Message {
-	return &SwInterfaceGetTableReply{}
-}
 
 // SwInterfaceSetUnnumbered represents the VPP binary API message 'sw_interface_set_unnumbered'.
-// Generated from 'interface.api.json', line 543:
 //
 //            "sw_interface_set_unnumbered",
 //            [
@@ -1183,12 +1109,8 @@ func (*SwInterfaceSetUnnumbered) GetCrcString() string {
 func (*SwInterfaceSetUnnumbered) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceSetUnnumbered() api.Message {
-	return &SwInterfaceSetUnnumbered{}
-}
 
 // SwInterfaceSetUnnumberedReply represents the VPP binary API message 'sw_interface_set_unnumbered_reply'.
-// Generated from 'interface.api.json', line 573:
 //
 //            "sw_interface_set_unnumbered_reply",
 //            [
@@ -1220,12 +1142,8 @@ func (*SwInterfaceSetUnnumberedReply) GetCrcString() string {
 func (*SwInterfaceSetUnnumberedReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceSetUnnumberedReply() api.Message {
-	return &SwInterfaceSetUnnumberedReply{}
-}
 
 // SwInterfaceClearStats represents the VPP binary API message 'sw_interface_clear_stats'.
-// Generated from 'interface.api.json', line 591:
 //
 //            "sw_interface_clear_stats",
 //            [
@@ -1261,12 +1179,8 @@ func (*SwInterfaceClearStats) GetCrcString() string {
 func (*SwInterfaceClearStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceClearStats() api.Message {
-	return &SwInterfaceClearStats{}
-}
 
 // SwInterfaceClearStatsReply represents the VPP binary API message 'sw_interface_clear_stats_reply'.
-// Generated from 'interface.api.json', line 613:
 //
 //            "sw_interface_clear_stats_reply",
 //            [
@@ -1298,12 +1212,8 @@ func (*SwInterfaceClearStatsReply) GetCrcString() string {
 func (*SwInterfaceClearStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceClearStatsReply() api.Message {
-	return &SwInterfaceClearStatsReply{}
-}
 
 // SwInterfaceTagAddDel represents the VPP binary API message 'sw_interface_tag_add_del'.
-// Generated from 'interface.api.json', line 631:
 //
 //            "sw_interface_tag_add_del",
 //            [
@@ -1350,12 +1260,8 @@ func (*SwInterfaceTagAddDel) GetCrcString() string {
 func (*SwInterfaceTagAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceTagAddDel() api.Message {
-	return &SwInterfaceTagAddDel{}
-}
 
 // SwInterfaceTagAddDelReply represents the VPP binary API message 'sw_interface_tag_add_del_reply'.
-// Generated from 'interface.api.json', line 662:
 //
 //            "sw_interface_tag_add_del_reply",
 //            [
@@ -1387,12 +1293,8 @@ func (*SwInterfaceTagAddDelReply) GetCrcString() string {
 func (*SwInterfaceTagAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceTagAddDelReply() api.Message {
-	return &SwInterfaceTagAddDelReply{}
-}
 
 // SwInterfaceSetMacAddress represents the VPP binary API message 'sw_interface_set_mac_address'.
-// Generated from 'interface.api.json', line 680:
 //
 //            "sw_interface_set_mac_address",
 //            [
@@ -1434,12 +1336,8 @@ func (*SwInterfaceSetMacAddress) GetCrcString() string {
 func (*SwInterfaceSetMacAddress) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceSetMacAddress() api.Message {
-	return &SwInterfaceSetMacAddress{}
-}
 
 // SwInterfaceSetMacAddressReply represents the VPP binary API message 'sw_interface_set_mac_address_reply'.
-// Generated from 'interface.api.json', line 707:
 //
 //            "sw_interface_set_mac_address_reply",
 //            [
@@ -1471,12 +1369,8 @@ func (*SwInterfaceSetMacAddressReply) GetCrcString() string {
 func (*SwInterfaceSetMacAddressReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceSetMacAddressReply() api.Message {
-	return &SwInterfaceSetMacAddressReply{}
-}
 
 // SwInterfaceGetMacAddress represents the VPP binary API message 'sw_interface_get_mac_address'.
-// Generated from 'interface.api.json', line 725:
 //
 //            "sw_interface_get_mac_address",
 //            [
@@ -1512,12 +1406,8 @@ func (*SwInterfaceGetMacAddress) GetCrcString() string {
 func (*SwInterfaceGetMacAddress) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceGetMacAddress() api.Message {
-	return &SwInterfaceGetMacAddress{}
-}
 
 // SwInterfaceGetMacAddressReply represents the VPP binary API message 'sw_interface_get_mac_address_reply'.
-// Generated from 'interface.api.json', line 747:
 //
 //            "sw_interface_get_mac_address_reply",
 //            [
@@ -1555,12 +1445,8 @@ func (*SwInterfaceGetMacAddressReply) GetCrcString() string {
 func (*SwInterfaceGetMacAddressReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceGetMacAddressReply() api.Message {
-	return &SwInterfaceGetMacAddressReply{}
-}
 
 // SwInterfaceSetRxMode represents the VPP binary API message 'sw_interface_set_rx_mode'.
-// Generated from 'interface.api.json', line 770:
 //
 //            "sw_interface_set_rx_mode",
 //            [
@@ -1611,12 +1497,8 @@ func (*SwInterfaceSetRxMode) GetCrcString() string {
 func (*SwInterfaceSetRxMode) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceSetRxMode() api.Message {
-	return &SwInterfaceSetRxMode{}
-}
 
 // SwInterfaceSetRxModeReply represents the VPP binary API message 'sw_interface_set_rx_mode_reply'.
-// Generated from 'interface.api.json', line 804:
 //
 //            "sw_interface_set_rx_mode_reply",
 //            [
@@ -1648,12 +1530,8 @@ func (*SwInterfaceSetRxModeReply) GetCrcString() string {
 func (*SwInterfaceSetRxModeReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceSetRxModeReply() api.Message {
-	return &SwInterfaceSetRxModeReply{}
-}
 
 // InterfaceNameRenumber represents the VPP binary API message 'interface_name_renumber'.
-// Generated from 'interface.api.json', line 822:
 //
 //            "interface_name_renumber",
 //            [
@@ -1694,12 +1572,8 @@ func (*InterfaceNameRenumber) GetCrcString() string {
 func (*InterfaceNameRenumber) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewInterfaceNameRenumber() api.Message {
-	return &InterfaceNameRenumber{}
-}
 
 // InterfaceNameRenumberReply represents the VPP binary API message 'interface_name_renumber_reply'.
-// Generated from 'interface.api.json', line 848:
 //
 //            "interface_name_renumber_reply",
 //            [
@@ -1731,12 +1605,8 @@ func (*InterfaceNameRenumberReply) GetCrcString() string {
 func (*InterfaceNameRenumberReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewInterfaceNameRenumberReply() api.Message {
-	return &InterfaceNameRenumberReply{}
-}
 
 // CreateSubif represents the VPP binary API message 'create_subif'.
-// Generated from 'interface.api.json', line 866:
 //
 //            "create_subif",
 //            [
@@ -1827,12 +1697,8 @@ func (*CreateSubif) GetCrcString() string {
 func (*CreateSubif) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewCreateSubif() api.Message {
-	return &CreateSubif{}
-}
 
 // CreateSubifReply represents the VPP binary API message 'create_subif_reply'.
-// Generated from 'interface.api.json', line 932:
 //
 //            "create_subif_reply",
 //            [
@@ -1869,12 +1735,8 @@ func (*CreateSubifReply) GetCrcString() string {
 func (*CreateSubifReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewCreateSubifReply() api.Message {
-	return &CreateSubifReply{}
-}
 
 // CreateVlanSubif represents the VPP binary API message 'create_vlan_subif'.
-// Generated from 'interface.api.json', line 954:
 //
 //            "create_vlan_subif",
 //            [
@@ -1915,12 +1777,8 @@ func (*CreateVlanSubif) GetCrcString() string {
 func (*CreateVlanSubif) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewCreateVlanSubif() api.Message {
-	return &CreateVlanSubif{}
-}
 
 // CreateVlanSubifReply represents the VPP binary API message 'create_vlan_subif_reply'.
-// Generated from 'interface.api.json', line 980:
 //
 //            "create_vlan_subif_reply",
 //            [
@@ -1957,12 +1815,8 @@ func (*CreateVlanSubifReply) GetCrcString() string {
 func (*CreateVlanSubifReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewCreateVlanSubifReply() api.Message {
-	return &CreateVlanSubifReply{}
-}
 
 // DeleteSubif represents the VPP binary API message 'delete_subif'.
-// Generated from 'interface.api.json', line 1002:
 //
 //            "delete_subif",
 //            [
@@ -1998,12 +1852,8 @@ func (*DeleteSubif) GetCrcString() string {
 func (*DeleteSubif) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewDeleteSubif() api.Message {
-	return &DeleteSubif{}
-}
 
 // DeleteSubifReply represents the VPP binary API message 'delete_subif_reply'.
-// Generated from 'interface.api.json', line 1024:
 //
 //            "delete_subif_reply",
 //            [
@@ -2035,12 +1885,8 @@ func (*DeleteSubifReply) GetCrcString() string {
 func (*DeleteSubifReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewDeleteSubifReply() api.Message {
-	return &DeleteSubifReply{}
-}
 
 // CreateLoopback represents the VPP binary API message 'create_loopback'.
-// Generated from 'interface.api.json', line 1042:
 //
 //            "create_loopback",
 //            [
@@ -2077,12 +1923,8 @@ func (*CreateLoopback) GetCrcString() string {
 func (*CreateLoopback) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewCreateLoopback() api.Message {
-	return &CreateLoopback{}
-}
 
 // CreateLoopbackReply represents the VPP binary API message 'create_loopback_reply'.
-// Generated from 'interface.api.json', line 1065:
 //
 //            "create_loopback_reply",
 //            [
@@ -2119,12 +1961,8 @@ func (*CreateLoopbackReply) GetCrcString() string {
 func (*CreateLoopbackReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewCreateLoopbackReply() api.Message {
-	return &CreateLoopbackReply{}
-}
 
 // CreateLoopbackInstance represents the VPP binary API message 'create_loopback_instance'.
-// Generated from 'interface.api.json', line 1087:
 //
 //            "create_loopback_instance",
 //            [
@@ -2171,12 +2009,8 @@ func (*CreateLoopbackInstance) GetCrcString() string {
 func (*CreateLoopbackInstance) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewCreateLoopbackInstance() api.Message {
-	return &CreateLoopbackInstance{}
-}
 
 // CreateLoopbackInstanceReply represents the VPP binary API message 'create_loopback_instance_reply'.
-// Generated from 'interface.api.json', line 1118:
 //
 //            "create_loopback_instance_reply",
 //            [
@@ -2213,12 +2047,8 @@ func (*CreateLoopbackInstanceReply) GetCrcString() string {
 func (*CreateLoopbackInstanceReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewCreateLoopbackInstanceReply() api.Message {
-	return &CreateLoopbackInstanceReply{}
-}
 
 // DeleteLoopback represents the VPP binary API message 'delete_loopback'.
-// Generated from 'interface.api.json', line 1140:
 //
 //            "delete_loopback",
 //            [
@@ -2254,12 +2084,8 @@ func (*DeleteLoopback) GetCrcString() string {
 func (*DeleteLoopback) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewDeleteLoopback() api.Message {
-	return &DeleteLoopback{}
-}
 
 // DeleteLoopbackReply represents the VPP binary API message 'delete_loopback_reply'.
-// Generated from 'interface.api.json', line 1162:
 //
 //            "delete_loopback_reply",
 //            [
@@ -2291,12 +2117,8 @@ func (*DeleteLoopbackReply) GetCrcString() string {
 func (*DeleteLoopbackReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewDeleteLoopbackReply() api.Message {
-	return &DeleteLoopbackReply{}
-}
 
 // CollectDetailedInterfaceStats represents the VPP binary API message 'collect_detailed_interface_stats'.
-// Generated from 'interface.api.json', line 1180:
 //
 //            "collect_detailed_interface_stats",
 //            [
@@ -2337,12 +2159,8 @@ func (*CollectDetailedInterfaceStats) GetCrcString() string {
 func (*CollectDetailedInterfaceStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewCollectDetailedInterfaceStats() api.Message {
-	return &CollectDetailedInterfaceStats{}
-}
 
 // CollectDetailedInterfaceStatsReply represents the VPP binary API message 'collect_detailed_interface_stats_reply'.
-// Generated from 'interface.api.json', line 1206:
 //
 //            "collect_detailed_interface_stats_reply",
 //            [
@@ -2374,9 +2192,6 @@ func (*CollectDetailedInterfaceStatsReply) GetCrcString() string {
 func (*CollectDetailedInterfaceStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewCollectDetailedInterfaceStatsReply() api.Message {
-	return &CollectDetailedInterfaceStatsReply{}
-}
 
 /* Services */
 
diff --git a/examples/bin_api/ip/ip.ba.go b/examples/bin_api/ip/ip.ba.go
index 9dc3d56..abbddb9 100644
--- a/examples/bin_api/ip/ip.ba.go
+++ b/examples/bin_api/ip/ip.ba.go
@@ -1,18 +1,16 @@
 // Code generated by GoVPP binapi-generator. DO NOT EDIT.
-// source: ip.api.json
+//  source: ip.api.json
 
 /*
-Package ip is a generated VPP binary API of the 'ip' VPP module.
+ Package ip is a generated from VPP binary API module 'ip'.
 
-It is generated from this file:
-	ip.api.json
+ It contains following objects:
+	 87 messages
+	  8 types
+	  1 enum
+	  1 union
+	 42 services
 
-It contains these VPP binary API objects:
-	87 messages
-	8 types
-	1 enum
-	1 union
-	42 services
 */
 package ip
 
@@ -28,7 +26,6 @@ var _ = bytes.NewBuffer
 /* Enums */
 
 // AddressFamily represents the VPP binary API enum 'address_family'.
-// Generated from 'ip.api.json', line 2727:
 //
 //            "address_family",
 //            [
@@ -53,7 +50,6 @@ const (
 /* Types */
 
 // IP4Address represents the VPP binary API type 'ip4_address'.
-// Generated from 'ip.api.json', line 2743:
 //
 //            "ip4_address",
 //            [
@@ -77,7 +73,6 @@ func (*IP4Address) GetCrcString() string {
 }
 
 // IP6Address represents the VPP binary API type 'ip6_address'.
-// Generated from 'ip.api.json', line 2754:
 //
 //            "ip6_address",
 //            [
@@ -101,7 +96,6 @@ func (*IP6Address) GetCrcString() string {
 }
 
 // Address represents the VPP binary API type 'address'.
-// Generated from 'ip.api.json', line 2765:
 //
 //            "address",
 //            [
@@ -129,7 +123,6 @@ func (*Address) GetCrcString() string {
 }
 
 // Prefix represents the VPP binary API type 'prefix'.
-// Generated from 'ip.api.json', line 2779:
 //
 //            "prefix",
 //            [
@@ -157,7 +150,6 @@ func (*Prefix) GetCrcString() string {
 }
 
 // FibMplsLabel represents the VPP binary API type 'fib_mpls_label'.
-// Generated from 'ip.api.json', line 2793:
 //
 //            "fib_mpls_label",
 //            [
@@ -195,7 +187,6 @@ func (*FibMplsLabel) GetCrcString() string {
 }
 
 // FibPath represents the VPP binary API type 'fib_path'.
-// Generated from 'ip.api.json', line 2815:
 //
 //            "fib_path",
 //            [
@@ -315,7 +306,6 @@ func (*FibPath) GetCrcString() string {
 }
 
 // IP6RaPrefixInfo represents the VPP binary API type 'ip6_ra_prefix_info'.
-// Generated from 'ip.api.json', line 2903:
 //
 //            "ip6_ra_prefix_info",
 //            [
@@ -359,7 +349,6 @@ func (*IP6RaPrefixInfo) GetCrcString() string {
 }
 
 // ProxyArp represents the VPP binary API type 'proxy_arp'.
-// Generated from 'ip.api.json', line 2930:
 //
 //            "proxy_arp",
 //            [
@@ -396,7 +385,6 @@ func (*ProxyArp) GetCrcString() string {
 /* Unions */
 
 // AddressUnion represents the VPP binary API union 'address_union'.
-// Generated from 'ip.api.json', line 2562:
 //
 //            "address_union",
 //            [
@@ -451,7 +439,6 @@ func (u *AddressUnion) GetIP6() (a IP6Address) {
 /* Messages */
 
 // IPTableAddDel represents the VPP binary API message 'ip_table_add_del'.
-// Generated from 'ip.api.json', line 4:
 //
 //            "ip_table_add_del",
 //            [
@@ -503,12 +490,8 @@ func (*IPTableAddDel) GetCrcString() string {
 func (*IPTableAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPTableAddDel() api.Message {
-	return &IPTableAddDel{}
-}
 
 // IPTableAddDelReply represents the VPP binary API message 'ip_table_add_del_reply'.
-// Generated from 'ip.api.json', line 39:
 //
 //            "ip_table_add_del_reply",
 //            [
@@ -540,12 +523,8 @@ func (*IPTableAddDelReply) GetCrcString() string {
 func (*IPTableAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPTableAddDelReply() api.Message {
-	return &IPTableAddDelReply{}
-}
 
 // IPFibDump represents the VPP binary API message 'ip_fib_dump'.
-// Generated from 'ip.api.json', line 57:
 //
 //            "ip_fib_dump",
 //            [
@@ -575,12 +554,8 @@ func (*IPFibDump) GetCrcString() string {
 func (*IPFibDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPFibDump() api.Message {
-	return &IPFibDump{}
-}
 
 // IPFibDetails represents the VPP binary API message 'ip_fib_details'.
-// Generated from 'ip.api.json', line 75:
 //
 //            "ip_fib_details",
 //            [
@@ -641,12 +616,8 @@ func (*IPFibDetails) GetCrcString() string {
 func (*IPFibDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPFibDetails() api.Message {
-	return &IPFibDetails{}
-}
 
 // IP6FibDump represents the VPP binary API message 'ip6_fib_dump'.
-// Generated from 'ip.api.json', line 117:
 //
 //            "ip6_fib_dump",
 //            [
@@ -676,12 +647,8 @@ func (*IP6FibDump) GetCrcString() string {
 func (*IP6FibDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIP6FibDump() api.Message {
-	return &IP6FibDump{}
-}
 
 // IP6FibDetails represents the VPP binary API message 'ip6_fib_details'.
-// Generated from 'ip.api.json', line 135:
 //
 //            "ip6_fib_details",
 //            [
@@ -742,12 +709,8 @@ func (*IP6FibDetails) GetCrcString() string {
 func (*IP6FibDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIP6FibDetails() api.Message {
-	return &IP6FibDetails{}
-}
 
 // IPNeighborDump represents the VPP binary API message 'ip_neighbor_dump'.
-// Generated from 'ip.api.json', line 177:
 //
 //            "ip_neighbor_dump",
 //            [
@@ -788,12 +751,8 @@ func (*IPNeighborDump) GetCrcString() string {
 func (*IPNeighborDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPNeighborDump() api.Message {
-	return &IPNeighborDump{}
-}
 
 // IPNeighborDetails represents the VPP binary API message 'ip_neighbor_details'.
-// Generated from 'ip.api.json', line 203:
 //
 //            "ip_neighbor_details",
 //            [
@@ -847,12 +806,8 @@ func (*IPNeighborDetails) GetCrcString() string {
 func (*IPNeighborDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPNeighborDetails() api.Message {
-	return &IPNeighborDetails{}
-}
 
 // IPNeighborAddDel represents the VPP binary API message 'ip_neighbor_add_del'.
-// Generated from 'ip.api.json', line 239:
 //
 //            "ip_neighbor_add_del",
 //            [
@@ -920,12 +875,8 @@ func (*IPNeighborAddDel) GetCrcString() string {
 func (*IPNeighborAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPNeighborAddDel() api.Message {
-	return &IPNeighborAddDel{}
-}
 
 // IPNeighborAddDelReply represents the VPP binary API message 'ip_neighbor_add_del_reply'.
-// Generated from 'ip.api.json', line 287:
 //
 //            "ip_neighbor_add_del_reply",
 //            [
@@ -957,12 +908,8 @@ func (*IPNeighborAddDelReply) GetCrcString() string {
 func (*IPNeighborAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPNeighborAddDelReply() api.Message {
-	return &IPNeighborAddDelReply{}
-}
 
 // SetIPFlowHash represents the VPP binary API message 'set_ip_flow_hash'.
-// Generated from 'ip.api.json', line 305:
 //
 //            "set_ip_flow_hash",
 //            [
@@ -1033,12 +980,8 @@ func (*SetIPFlowHash) GetCrcString() string {
 func (*SetIPFlowHash) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSetIPFlowHash() api.Message {
-	return &SetIPFlowHash{}
-}
 
 // SetIPFlowHashReply represents the VPP binary API message 'set_ip_flow_hash_reply'.
-// Generated from 'ip.api.json', line 355:
 //
 //            "set_ip_flow_hash_reply",
 //            [
@@ -1070,12 +1013,8 @@ func (*SetIPFlowHashReply) GetCrcString() string {
 func (*SetIPFlowHashReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSetIPFlowHashReply() api.Message {
-	return &SetIPFlowHashReply{}
-}
 
 // SwInterfaceIP6ndRaConfig represents the VPP binary API message 'sw_interface_ip6nd_ra_config'.
-// Generated from 'ip.api.json', line 373:
 //
 //            "sw_interface_ip6nd_ra_config",
 //            [
@@ -1176,12 +1115,8 @@ func (*SwInterfaceIP6ndRaConfig) GetCrcString() string {
 func (*SwInterfaceIP6ndRaConfig) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceIP6ndRaConfig() api.Message {
-	return &SwInterfaceIP6ndRaConfig{}
-}
 
 // SwInterfaceIP6ndRaConfigReply represents the VPP binary API message 'sw_interface_ip6nd_ra_config_reply'.
-// Generated from 'ip.api.json', line 447:
 //
 //            "sw_interface_ip6nd_ra_config_reply",
 //            [
@@ -1213,12 +1148,8 @@ func (*SwInterfaceIP6ndRaConfigReply) GetCrcString() string {
 func (*SwInterfaceIP6ndRaConfigReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceIP6ndRaConfigReply() api.Message {
-	return &SwInterfaceIP6ndRaConfigReply{}
-}
 
 // SwInterfaceIP6ndRaPrefix represents the VPP binary API message 'sw_interface_ip6nd_ra_prefix'.
-// Generated from 'ip.api.json', line 465:
 //
 //            "sw_interface_ip6nd_ra_prefix",
 //            [
@@ -1305,12 +1236,8 @@ func (*SwInterfaceIP6ndRaPrefix) GetCrcString() string {
 func (*SwInterfaceIP6ndRaPrefix) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceIP6ndRaPrefix() api.Message {
-	return &SwInterfaceIP6ndRaPrefix{}
-}
 
 // SwInterfaceIP6ndRaPrefixReply represents the VPP binary API message 'sw_interface_ip6nd_ra_prefix_reply'.
-// Generated from 'ip.api.json', line 528:
 //
 //            "sw_interface_ip6nd_ra_prefix_reply",
 //            [
@@ -1342,12 +1269,8 @@ func (*SwInterfaceIP6ndRaPrefixReply) GetCrcString() string {
 func (*SwInterfaceIP6ndRaPrefixReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceIP6ndRaPrefixReply() api.Message {
-	return &SwInterfaceIP6ndRaPrefixReply{}
-}
 
 // IP6ndProxyAddDel represents the VPP binary API message 'ip6nd_proxy_add_del'.
-// Generated from 'ip.api.json', line 546:
 //
 //            "ip6nd_proxy_add_del",
 //            [
@@ -1394,12 +1317,8 @@ func (*IP6ndProxyAddDel) GetCrcString() string {
 func (*IP6ndProxyAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIP6ndProxyAddDel() api.Message {
-	return &IP6ndProxyAddDel{}
-}
 
 // IP6ndProxyAddDelReply represents the VPP binary API message 'ip6nd_proxy_add_del_reply'.
-// Generated from 'ip.api.json', line 577:
 //
 //            "ip6nd_proxy_add_del_reply",
 //            [
@@ -1431,12 +1350,8 @@ func (*IP6ndProxyAddDelReply) GetCrcString() string {
 func (*IP6ndProxyAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIP6ndProxyAddDelReply() api.Message {
-	return &IP6ndProxyAddDelReply{}
-}
 
 // IP6ndProxyDetails represents the VPP binary API message 'ip6nd_proxy_details'.
-// Generated from 'ip.api.json', line 595:
 //
 //            "ip6nd_proxy_details",
 //            [
@@ -1478,12 +1393,8 @@ func (*IP6ndProxyDetails) GetCrcString() string {
 func (*IP6ndProxyDetails) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIP6ndProxyDetails() api.Message {
-	return &IP6ndProxyDetails{}
-}
 
 // IP6ndProxyDump represents the VPP binary API message 'ip6nd_proxy_dump'.
-// Generated from 'ip.api.json', line 622:
 //
 //            "ip6nd_proxy_dump",
 //            [
@@ -1513,12 +1424,8 @@ func (*IP6ndProxyDump) GetCrcString() string {
 func (*IP6ndProxyDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIP6ndProxyDump() api.Message {
-	return &IP6ndProxyDump{}
-}
 
 // IP6ndSendRouterSolicitation represents the VPP binary API message 'ip6nd_send_router_solicitation'.
-// Generated from 'ip.api.json', line 640:
 //
 //            "ip6nd_send_router_solicitation",
 //            [
@@ -1579,12 +1486,8 @@ func (*IP6ndSendRouterSolicitation) GetCrcString() string {
 func (*IP6ndSendRouterSolicitation) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIP6ndSendRouterSolicitation() api.Message {
-	return &IP6ndSendRouterSolicitation{}
-}
 
 // IP6ndSendRouterSolicitationReply represents the VPP binary API message 'ip6nd_send_router_solicitation_reply'.
-// Generated from 'ip.api.json', line 682:
 //
 //            "ip6nd_send_router_solicitation_reply",
 //            [
@@ -1616,12 +1519,8 @@ func (*IP6ndSendRouterSolicitationReply) GetCrcString() string {
 func (*IP6ndSendRouterSolicitationReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIP6ndSendRouterSolicitationReply() api.Message {
-	return &IP6ndSendRouterSolicitationReply{}
-}
 
 // SwInterfaceIP6EnableDisable represents the VPP binary API message 'sw_interface_ip6_enable_disable'.
-// Generated from 'ip.api.json', line 700:
 //
 //            "sw_interface_ip6_enable_disable",
 //            [
@@ -1662,12 +1561,8 @@ func (*SwInterfaceIP6EnableDisable) GetCrcString() string {
 func (*SwInterfaceIP6EnableDisable) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceIP6EnableDisable() api.Message {
-	return &SwInterfaceIP6EnableDisable{}
-}
 
 // SwInterfaceIP6EnableDisableReply represents the VPP binary API message 'sw_interface_ip6_enable_disable_reply'.
-// Generated from 'ip.api.json', line 726:
 //
 //            "sw_interface_ip6_enable_disable_reply",
 //            [
@@ -1699,12 +1594,8 @@ func (*SwInterfaceIP6EnableDisableReply) GetCrcString() string {
 func (*SwInterfaceIP6EnableDisableReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceIP6EnableDisableReply() api.Message {
-	return &SwInterfaceIP6EnableDisableReply{}
-}
 
 // SwInterfaceIP6SetLinkLocalAddress represents the VPP binary API message 'sw_interface_ip6_set_link_local_address'.
-// Generated from 'ip.api.json', line 744:
 //
 //            "sw_interface_ip6_set_link_local_address",
 //            [
@@ -1746,12 +1637,8 @@ func (*SwInterfaceIP6SetLinkLocalAddress) GetCrcString() string {
 func (*SwInterfaceIP6SetLinkLocalAddress) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceIP6SetLinkLocalAddress() api.Message {
-	return &SwInterfaceIP6SetLinkLocalAddress{}
-}
 
 // SwInterfaceIP6SetLinkLocalAddressReply represents the VPP binary API message 'sw_interface_ip6_set_link_local_address_reply'.
-// Generated from 'ip.api.json', line 771:
 //
 //            "sw_interface_ip6_set_link_local_address_reply",
 //            [
@@ -1783,12 +1670,8 @@ func (*SwInterfaceIP6SetLinkLocalAddressReply) GetCrcString() string {
 func (*SwInterfaceIP6SetLinkLocalAddressReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceIP6SetLinkLocalAddressReply() api.Message {
-	return &SwInterfaceIP6SetLinkLocalAddressReply{}
-}
 
 // IPAddDelRoute represents the VPP binary API message 'ip_add_del_route'.
-// Generated from 'ip.api.json', line 789:
 //
 //            "ip_add_del_route",
 //            [
@@ -1958,12 +1841,8 @@ func (*IPAddDelRoute) GetCrcString() string {
 func (*IPAddDelRoute) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPAddDelRoute() api.Message {
-	return &IPAddDelRoute{}
-}
 
 // IPAddDelRouteReply represents the VPP binary API message 'ip_add_del_route_reply'.
-// Generated from 'ip.api.json', line 919:
 //
 //            "ip_add_del_route_reply",
 //            [
@@ -1995,12 +1874,8 @@ func (*IPAddDelRouteReply) GetCrcString() string {
 func (*IPAddDelRouteReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPAddDelRouteReply() api.Message {
-	return &IPAddDelRouteReply{}
-}
 
 // IPMrouteAddDel represents the VPP binary API message 'ip_mroute_add_del'.
-// Generated from 'ip.api.json', line 937:
 //
 //            "ip_mroute_add_del",
 //            [
@@ -2104,12 +1979,8 @@ func (*IPMrouteAddDel) GetCrcString() string {
 func (*IPMrouteAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPMrouteAddDel() api.Message {
-	return &IPMrouteAddDel{}
-}
 
 // IPMrouteAddDelReply represents the VPP binary API message 'ip_mroute_add_del_reply'.
-// Generated from 'ip.api.json', line 1014:
 //
 //            "ip_mroute_add_del_reply",
 //            [
@@ -2141,12 +2012,8 @@ func (*IPMrouteAddDelReply) GetCrcString() string {
 func (*IPMrouteAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPMrouteAddDelReply() api.Message {
-	return &IPMrouteAddDelReply{}
-}
 
 // IPMfibDump represents the VPP binary API message 'ip_mfib_dump'.
-// Generated from 'ip.api.json', line 1032:
 //
 //            "ip_mfib_dump",
 //            [
@@ -2176,12 +2043,8 @@ func (*IPMfibDump) GetCrcString() string {
 func (*IPMfibDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPMfibDump() api.Message {
-	return &IPMfibDump{}
-}
 
 // IPMfibDetails represents the VPP binary API message 'ip_mfib_details'.
-// Generated from 'ip.api.json', line 1050:
 //
 //            "ip_mfib_details",
 //            [
@@ -2252,12 +2115,8 @@ func (*IPMfibDetails) GetCrcString() string {
 func (*IPMfibDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPMfibDetails() api.Message {
-	return &IPMfibDetails{}
-}
 
 // IP6MfibDump represents the VPP binary API message 'ip6_mfib_dump'.
-// Generated from 'ip.api.json', line 1100:
 //
 //            "ip6_mfib_dump",
 //            [
@@ -2287,12 +2146,8 @@ func (*IP6MfibDump) GetCrcString() string {
 func (*IP6MfibDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIP6MfibDump() api.Message {
-	return &IP6MfibDump{}
-}
 
 // IP6MfibDetails represents the VPP binary API message 'ip6_mfib_details'.
-// Generated from 'ip.api.json', line 1118:
 //
 //            "ip6_mfib_details",
 //            [
@@ -2353,12 +2208,8 @@ func (*IP6MfibDetails) GetCrcString() string {
 func (*IP6MfibDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIP6MfibDetails() api.Message {
-	return &IP6MfibDetails{}
-}
 
 // IPAddressDetails represents the VPP binary API message 'ip_address_details'.
-// Generated from 'ip.api.json', line 1160:
 //
 //            "ip_address_details",
 //            [
@@ -2410,12 +2261,8 @@ func (*IPAddressDetails) GetCrcString() string {
 func (*IPAddressDetails) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPAddressDetails() api.Message {
-	return &IPAddressDetails{}
-}
 
 // IPAddressDump represents the VPP binary API message 'ip_address_dump'.
-// Generated from 'ip.api.json', line 1195:
 //
 //            "ip_address_dump",
 //            [
@@ -2456,12 +2303,8 @@ func (*IPAddressDump) GetCrcString() string {
 func (*IPAddressDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPAddressDump() api.Message {
-	return &IPAddressDump{}
-}
 
 // IPUnnumberedDetails represents the VPP binary API message 'ip_unnumbered_details'.
-// Generated from 'ip.api.json', line 1221:
 //
 //            "ip_unnumbered_details",
 //            [
@@ -2502,12 +2345,8 @@ func (*IPUnnumberedDetails) GetCrcString() string {
 func (*IPUnnumberedDetails) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPUnnumberedDetails() api.Message {
-	return &IPUnnumberedDetails{}
-}
 
 // IPUnnumberedDump represents the VPP binary API message 'ip_unnumbered_dump'.
-// Generated from 'ip.api.json', line 1247:
 //
 //            "ip_unnumbered_dump",
 //            [
@@ -2543,12 +2382,8 @@ func (*IPUnnumberedDump) GetCrcString() string {
 func (*IPUnnumberedDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPUnnumberedDump() api.Message {
-	return &IPUnnumberedDump{}
-}
 
 // IPDetails represents the VPP binary API message 'ip_details'.
-// Generated from 'ip.api.json', line 1269:
 //
 //            "ip_details",
 //            [
@@ -2586,12 +2421,8 @@ func (*IPDetails) GetCrcString() string {
 func (*IPDetails) GetMessageType() api.MessageType {
 	return api.OtherMessage
 }
-func NewIPDetails() api.Message {
-	return &IPDetails{}
-}
 
 // IPDump represents the VPP binary API message 'ip_dump'.
-// Generated from 'ip.api.json', line 1291:
 //
 //            "ip_dump",
 //            [
@@ -2627,12 +2458,8 @@ func (*IPDump) GetCrcString() string {
 func (*IPDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPDump() api.Message {
-	return &IPDump{}
-}
 
 // MfibSignalDump represents the VPP binary API message 'mfib_signal_dump'.
-// Generated from 'ip.api.json', line 1313:
 //
 //            "mfib_signal_dump",
 //            [
@@ -2662,12 +2489,8 @@ func (*MfibSignalDump) GetCrcString() string {
 func (*MfibSignalDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMfibSignalDump() api.Message {
-	return &MfibSignalDump{}
-}
 
 // MfibSignalDetails represents the VPP binary API message 'mfib_signal_details'.
-// Generated from 'ip.api.json', line 1331:
 //
 //            "mfib_signal_details",
 //            [
@@ -2736,12 +2559,8 @@ func (*MfibSignalDetails) GetCrcString() string {
 func (*MfibSignalDetails) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMfibSignalDetails() api.Message {
-	return &MfibSignalDetails{}
-}
 
 // IPPuntPolice represents the VPP binary API message 'ip_punt_police'.
-// Generated from 'ip.api.json', line 1380:
 //
 //            "ip_punt_police",
 //            [
@@ -2787,12 +2606,8 @@ func (*IPPuntPolice) GetCrcString() string {
 func (*IPPuntPolice) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPPuntPolice() api.Message {
-	return &IPPuntPolice{}
-}
 
 // IPPuntPoliceReply represents the VPP binary API message 'ip_punt_police_reply'.
-// Generated from 'ip.api.json', line 1410:
 //
 //            "ip_punt_police_reply",
 //            [
@@ -2824,12 +2639,8 @@ func (*IPPuntPoliceReply) GetCrcString() string {
 func (*IPPuntPoliceReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPPuntPoliceReply() api.Message {
-	return &IPPuntPoliceReply{}
-}
 
 // IPPuntRedirect represents the VPP binary API message 'ip_punt_redirect'.
-// Generated from 'ip.api.json', line 1428:
 //
 //            "ip_punt_redirect",
 //            [
@@ -2886,12 +2697,8 @@ func (*IPPuntRedirect) GetCrcString() string {
 func (*IPPuntRedirect) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPPuntRedirect() api.Message {
-	return &IPPuntRedirect{}
-}
 
 // IPPuntRedirectReply represents the VPP binary API message 'ip_punt_redirect_reply'.
-// Generated from 'ip.api.json', line 1467:
 //
 //            "ip_punt_redirect_reply",
 //            [
@@ -2923,12 +2730,8 @@ func (*IPPuntRedirectReply) GetCrcString() string {
 func (*IPPuntRedirectReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPPuntRedirectReply() api.Message {
-	return &IPPuntRedirectReply{}
-}
 
 // IPContainerProxyAddDel represents the VPP binary API message 'ip_container_proxy_add_del'.
-// Generated from 'ip.api.json', line 1485:
 //
 //            "ip_container_proxy_add_del",
 //            [
@@ -2985,12 +2788,8 @@ func (*IPContainerProxyAddDel) GetCrcString() string {
 func (*IPContainerProxyAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPContainerProxyAddDel() api.Message {
-	return &IPContainerProxyAddDel{}
-}
 
 // IPContainerProxyAddDelReply represents the VPP binary API message 'ip_container_proxy_add_del_reply'.
-// Generated from 'ip.api.json', line 1524:
 //
 //            "ip_container_proxy_add_del_reply",
 //            [
@@ -3022,12 +2821,8 @@ func (*IPContainerProxyAddDelReply) GetCrcString() string {
 func (*IPContainerProxyAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPContainerProxyAddDelReply() api.Message {
-	return &IPContainerProxyAddDelReply{}
-}
 
 // IPSourceAndPortRangeCheckAddDel represents the VPP binary API message 'ip_source_and_port_range_check_add_del'.
-// Generated from 'ip.api.json', line 1542:
 //
 //            "ip_source_and_port_range_check_add_del",
 //            [
@@ -3101,12 +2896,8 @@ func (*IPSourceAndPortRangeCheckAddDel) GetCrcString() string {
 func (*IPSourceAndPortRangeCheckAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPSourceAndPortRangeCheckAddDel() api.Message {
-	return &IPSourceAndPortRangeCheckAddDel{}
-}
 
 // IPSourceAndPortRangeCheckAddDelReply represents the VPP binary API message 'ip_source_and_port_range_check_add_del_reply'.
-// Generated from 'ip.api.json', line 1595:
 //
 //            "ip_source_and_port_range_check_add_del_reply",
 //            [
@@ -3138,12 +2929,8 @@ func (*IPSourceAndPortRangeCheckAddDelReply) GetCrcString() string {
 func (*IPSourceAndPortRangeCheckAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPSourceAndPortRangeCheckAddDelReply() api.Message {
-	return &IPSourceAndPortRangeCheckAddDelReply{}
-}
 
 // IPSourceAndPortRangeCheckInterfaceAddDel represents the VPP binary API message 'ip_source_and_port_range_check_interface_add_del'.
-// Generated from 'ip.api.json', line 1613:
 //
 //            "ip_source_and_port_range_check_interface_add_del",
 //            [
@@ -3204,12 +2991,8 @@ func (*IPSourceAndPortRangeCheckInterfaceAddDel) GetCrcString() string {
 func (*IPSourceAndPortRangeCheckInterfaceAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPSourceAndPortRangeCheckInterfaceAddDel() api.Message {
-	return &IPSourceAndPortRangeCheckInterfaceAddDel{}
-}
 
 // IPSourceAndPortRangeCheckInterfaceAddDelReply represents the VPP binary API message 'ip_source_and_port_range_check_interface_add_del_reply'.
-// Generated from 'ip.api.json', line 1655:
 //
 //            "ip_source_and_port_range_check_interface_add_del_reply",
 //            [
@@ -3241,12 +3024,8 @@ func (*IPSourceAndPortRangeCheckInterfaceAddDelReply) GetCrcString() string {
 func (*IPSourceAndPortRangeCheckInterfaceAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPSourceAndPortRangeCheckInterfaceAddDelReply() api.Message {
-	return &IPSourceAndPortRangeCheckInterfaceAddDelReply{}
-}
 
 // IPScanNeighborEnableDisable represents the VPP binary API message 'ip_scan_neighbor_enable_disable'.
-// Generated from 'ip.api.json', line 1673:
 //
 //            "ip_scan_neighbor_enable_disable",
 //            [
@@ -3307,12 +3086,8 @@ func (*IPScanNeighborEnableDisable) GetCrcString() string {
 func (*IPScanNeighborEnableDisable) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPScanNeighborEnableDisable() api.Message {
-	return &IPScanNeighborEnableDisable{}
-}
 
 // IPScanNeighborEnableDisableReply represents the VPP binary API message 'ip_scan_neighbor_enable_disable_reply'.
-// Generated from 'ip.api.json', line 1715:
 //
 //            "ip_scan_neighbor_enable_disable_reply",
 //            [
@@ -3344,12 +3119,8 @@ func (*IPScanNeighborEnableDisableReply) GetCrcString() string {
 func (*IPScanNeighborEnableDisableReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPScanNeighborEnableDisableReply() api.Message {
-	return &IPScanNeighborEnableDisableReply{}
-}
 
 // IPProbeNeighbor represents the VPP binary API message 'ip_probe_neighbor'.
-// Generated from 'ip.api.json', line 1733:
 //
 //            "ip_probe_neighbor",
 //            [
@@ -3396,12 +3167,8 @@ func (*IPProbeNeighbor) GetCrcString() string {
 func (*IPProbeNeighbor) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPProbeNeighbor() api.Message {
-	return &IPProbeNeighbor{}
-}
 
 // IPProbeNeighborReply represents the VPP binary API message 'ip_probe_neighbor_reply'.
-// Generated from 'ip.api.json', line 1764:
 //
 //            "ip_probe_neighbor_reply",
 //            [
@@ -3433,12 +3200,8 @@ func (*IPProbeNeighborReply) GetCrcString() string {
 func (*IPProbeNeighborReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPProbeNeighborReply() api.Message {
-	return &IPProbeNeighborReply{}
-}
 
 // WantIP4ArpEvents represents the VPP binary API message 'want_ip4_arp_events'.
-// Generated from 'ip.api.json', line 1782:
 //
 //            "want_ip4_arp_events",
 //            [
@@ -3484,12 +3247,8 @@ func (*WantIP4ArpEvents) GetCrcString() string {
 func (*WantIP4ArpEvents) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantIP4ArpEvents() api.Message {
-	return &WantIP4ArpEvents{}
-}
 
 // WantIP4ArpEventsReply represents the VPP binary API message 'want_ip4_arp_events_reply'.
-// Generated from 'ip.api.json', line 1812:
 //
 //            "want_ip4_arp_events_reply",
 //            [
@@ -3521,12 +3280,8 @@ func (*WantIP4ArpEventsReply) GetCrcString() string {
 func (*WantIP4ArpEventsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantIP4ArpEventsReply() api.Message {
-	return &WantIP4ArpEventsReply{}
-}
 
 // IP4ArpEvent represents the VPP binary API message 'ip4_arp_event'.
-// Generated from 'ip.api.json', line 1830:
 //
 //            "ip4_arp_event",
 //            [
@@ -3579,12 +3334,8 @@ func (*IP4ArpEvent) GetCrcString() string {
 func (*IP4ArpEvent) GetMessageType() api.MessageType {
 	return api.EventMessage
 }
-func NewIP4ArpEvent() api.Message {
-	return &IP4ArpEvent{}
-}
 
 // WantIP6NdEvents represents the VPP binary API message 'want_ip6_nd_events'.
-// Generated from 'ip.api.json', line 1865:
 //
 //            "want_ip6_nd_events",
 //            [
@@ -3631,12 +3382,8 @@ func (*WantIP6NdEvents) GetCrcString() string {
 func (*WantIP6NdEvents) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantIP6NdEvents() api.Message {
-	return &WantIP6NdEvents{}
-}
 
 // WantIP6NdEventsReply represents the VPP binary API message 'want_ip6_nd_events_reply'.
-// Generated from 'ip.api.json', line 1896:
 //
 //            "want_ip6_nd_events_reply",
 //            [
@@ -3668,12 +3415,8 @@ func (*WantIP6NdEventsReply) GetCrcString() string {
 func (*WantIP6NdEventsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantIP6NdEventsReply() api.Message {
-	return &WantIP6NdEventsReply{}
-}
 
 // IP6NdEvent represents the VPP binary API message 'ip6_nd_event'.
-// Generated from 'ip.api.json', line 1914:
 //
 //            "ip6_nd_event",
 //            [
@@ -3727,12 +3470,8 @@ func (*IP6NdEvent) GetCrcString() string {
 func (*IP6NdEvent) GetMessageType() api.MessageType {
 	return api.EventMessage
 }
-func NewIP6NdEvent() api.Message {
-	return &IP6NdEvent{}
-}
 
 // WantIP6RaEvents represents the VPP binary API message 'want_ip6_ra_events'.
-// Generated from 'ip.api.json', line 1950:
 //
 //            "want_ip6_ra_events",
 //            [
@@ -3773,12 +3512,8 @@ func (*WantIP6RaEvents) GetCrcString() string {
 func (*WantIP6RaEvents) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantIP6RaEvents() api.Message {
-	return &WantIP6RaEvents{}
-}
 
 // WantIP6RaEventsReply represents the VPP binary API message 'want_ip6_ra_events_reply'.
-// Generated from 'ip.api.json', line 1976:
 //
 //            "want_ip6_ra_events_reply",
 //            [
@@ -3810,12 +3545,8 @@ func (*WantIP6RaEventsReply) GetCrcString() string {
 func (*WantIP6RaEventsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantIP6RaEventsReply() api.Message {
-	return &WantIP6RaEventsReply{}
-}
 
 // IP6RaEvent represents the VPP binary API message 'ip6_ra_event'.
-// Generated from 'ip.api.json', line 1994:
 //
 //            "ip6_ra_event",
 //            [
@@ -3895,12 +3626,8 @@ func (*IP6RaEvent) GetCrcString() string {
 func (*IP6RaEvent) GetMessageType() api.MessageType {
 	return api.EventMessage
 }
-func NewIP6RaEvent() api.Message {
-	return &IP6RaEvent{}
-}
 
 // ProxyArpAddDel represents the VPP binary API message 'proxy_arp_add_del'.
-// Generated from 'ip.api.json', line 2051:
 //
 //            "proxy_arp_add_del",
 //            [
@@ -3941,12 +3668,8 @@ func (*ProxyArpAddDel) GetCrcString() string {
 func (*ProxyArpAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewProxyArpAddDel() api.Message {
-	return &ProxyArpAddDel{}
-}
 
 // ProxyArpAddDelReply represents the VPP binary API message 'proxy_arp_add_del_reply'.
-// Generated from 'ip.api.json', line 2077:
 //
 //            "proxy_arp_add_del_reply",
 //            [
@@ -3978,12 +3701,8 @@ func (*ProxyArpAddDelReply) GetCrcString() string {
 func (*ProxyArpAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewProxyArpAddDelReply() api.Message {
-	return &ProxyArpAddDelReply{}
-}
 
 // ProxyArpDump represents the VPP binary API message 'proxy_arp_dump'.
-// Generated from 'ip.api.json', line 2095:
 //
 //            "proxy_arp_dump",
 //            [
@@ -4013,12 +3732,8 @@ func (*ProxyArpDump) GetCrcString() string {
 func (*ProxyArpDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewProxyArpDump() api.Message {
-	return &ProxyArpDump{}
-}
 
 // ProxyArpDetails represents the VPP binary API message 'proxy_arp_details'.
-// Generated from 'ip.api.json', line 2113:
 //
 //            "proxy_arp_details",
 //            [
@@ -4050,12 +3765,8 @@ func (*ProxyArpDetails) GetCrcString() string {
 func (*ProxyArpDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewProxyArpDetails() api.Message {
-	return &ProxyArpDetails{}
-}
 
 // ProxyArpIntfcEnableDisable represents the VPP binary API message 'proxy_arp_intfc_enable_disable'.
-// Generated from 'ip.api.json', line 2131:
 //
 //            "proxy_arp_intfc_enable_disable",
 //            [
@@ -4096,12 +3807,8 @@ func (*ProxyArpIntfcEnableDisable) GetCrcString() string {
 func (*ProxyArpIntfcEnableDisable) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewProxyArpIntfcEnableDisable() api.Message {
-	return &ProxyArpIntfcEnableDisable{}
-}
 
 // ProxyArpIntfcEnableDisableReply represents the VPP binary API message 'proxy_arp_intfc_enable_disable_reply'.
-// Generated from 'ip.api.json', line 2157:
 //
 //            "proxy_arp_intfc_enable_disable_reply",
 //            [
@@ -4133,12 +3840,8 @@ func (*ProxyArpIntfcEnableDisableReply) GetCrcString() string {
 func (*ProxyArpIntfcEnableDisableReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewProxyArpIntfcEnableDisableReply() api.Message {
-	return &ProxyArpIntfcEnableDisableReply{}
-}
 
 // ProxyArpIntfcDump represents the VPP binary API message 'proxy_arp_intfc_dump'.
-// Generated from 'ip.api.json', line 2175:
 //
 //            "proxy_arp_intfc_dump",
 //            [
@@ -4168,12 +3871,8 @@ func (*ProxyArpIntfcDump) GetCrcString() string {
 func (*ProxyArpIntfcDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewProxyArpIntfcDump() api.Message {
-	return &ProxyArpIntfcDump{}
-}
 
 // ProxyArpIntfcDetails represents the VPP binary API message 'proxy_arp_intfc_details'.
-// Generated from 'ip.api.json', line 2193:
 //
 //            "proxy_arp_intfc_details",
 //            [
@@ -4205,12 +3904,8 @@ func (*ProxyArpIntfcDetails) GetCrcString() string {
 func (*ProxyArpIntfcDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewProxyArpIntfcDetails() api.Message {
-	return &ProxyArpIntfcDetails{}
-}
 
 // ResetFib represents the VPP binary API message 'reset_fib'.
-// Generated from 'ip.api.json', line 2211:
 //
 //            "reset_fib",
 //            [
@@ -4251,12 +3946,8 @@ func (*ResetFib) GetCrcString() string {
 func (*ResetFib) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewResetFib() api.Message {
-	return &ResetFib{}
-}
 
 // ResetFibReply represents the VPP binary API message 'reset_fib_reply'.
-// Generated from 'ip.api.json', line 2237:
 //
 //            "reset_fib_reply",
 //            [
@@ -4288,12 +3979,8 @@ func (*ResetFibReply) GetCrcString() string {
 func (*ResetFibReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewResetFibReply() api.Message {
-	return &ResetFibReply{}
-}
 
 // SetArpNeighborLimit represents the VPP binary API message 'set_arp_neighbor_limit'.
-// Generated from 'ip.api.json', line 2255:
 //
 //            "set_arp_neighbor_limit",
 //            [
@@ -4334,12 +4021,8 @@ func (*SetArpNeighborLimit) GetCrcString() string {
 func (*SetArpNeighborLimit) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSetArpNeighborLimit() api.Message {
-	return &SetArpNeighborLimit{}
-}
 
 // SetArpNeighborLimitReply represents the VPP binary API message 'set_arp_neighbor_limit_reply'.
-// Generated from 'ip.api.json', line 2281:
 //
 //            "set_arp_neighbor_limit_reply",
 //            [
@@ -4371,12 +4054,8 @@ func (*SetArpNeighborLimitReply) GetCrcString() string {
 func (*SetArpNeighborLimitReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSetArpNeighborLimitReply() api.Message {
-	return &SetArpNeighborLimitReply{}
-}
 
 // IoamEnable represents the VPP binary API message 'ioam_enable'.
-// Generated from 'ip.api.json', line 2299:
 //
 //            "ioam_enable",
 //            [
@@ -4437,12 +4116,8 @@ func (*IoamEnable) GetCrcString() string {
 func (*IoamEnable) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIoamEnable() api.Message {
-	return &IoamEnable{}
-}
 
 // IoamEnableReply represents the VPP binary API message 'ioam_enable_reply'.
-// Generated from 'ip.api.json', line 2341:
 //
 //            "ioam_enable_reply",
 //            [
@@ -4474,12 +4149,8 @@ func (*IoamEnableReply) GetCrcString() string {
 func (*IoamEnableReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIoamEnableReply() api.Message {
-	return &IoamEnableReply{}
-}
 
 // IoamDisable represents the VPP binary API message 'ioam_disable'.
-// Generated from 'ip.api.json', line 2359:
 //
 //            "ioam_disable",
 //            [
@@ -4515,12 +4186,8 @@ func (*IoamDisable) GetCrcString() string {
 func (*IoamDisable) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIoamDisable() api.Message {
-	return &IoamDisable{}
-}
 
 // IoamDisableReply represents the VPP binary API message 'ioam_disable_reply'.
-// Generated from 'ip.api.json', line 2381:
 //
 //            "ioam_disable_reply",
 //            [
@@ -4552,12 +4219,8 @@ func (*IoamDisableReply) GetCrcString() string {
 func (*IoamDisableReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIoamDisableReply() api.Message {
-	return &IoamDisableReply{}
-}
 
 // IPReassemblySet represents the VPP binary API message 'ip_reassembly_set'.
-// Generated from 'ip.api.json', line 2399:
 //
 //            "ip_reassembly_set",
 //            [
@@ -4608,12 +4271,8 @@ func (*IPReassemblySet) GetCrcString() string {
 func (*IPReassemblySet) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPReassemblySet() api.Message {
-	return &IPReassemblySet{}
-}
 
 // IPReassemblySetReply represents the VPP binary API message 'ip_reassembly_set_reply'.
-// Generated from 'ip.api.json', line 2433:
 //
 //            "ip_reassembly_set_reply",
 //            [
@@ -4645,12 +4304,8 @@ func (*IPReassemblySetReply) GetCrcString() string {
 func (*IPReassemblySetReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPReassemblySetReply() api.Message {
-	return &IPReassemblySetReply{}
-}
 
 // IPReassemblyGet represents the VPP binary API message 'ip_reassembly_get'.
-// Generated from 'ip.api.json', line 2451:
 //
 //            "ip_reassembly_get",
 //            [
@@ -4686,12 +4341,8 @@ func (*IPReassemblyGet) GetCrcString() string {
 func (*IPReassemblyGet) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPReassemblyGet() api.Message {
-	return &IPReassemblyGet{}
-}
 
 // IPReassemblyGetReply represents the VPP binary API message 'ip_reassembly_get_reply'.
-// Generated from 'ip.api.json', line 2473:
 //
 //            "ip_reassembly_get_reply",
 //            [
@@ -4747,12 +4398,8 @@ func (*IPReassemblyGetReply) GetCrcString() string {
 func (*IPReassemblyGetReply) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPReassemblyGetReply() api.Message {
-	return &IPReassemblyGetReply{}
-}
 
 // IPReassemblyEnableDisable represents the VPP binary API message 'ip_reassembly_enable_disable'.
-// Generated from 'ip.api.json', line 2511:
 //
 //            "ip_reassembly_enable_disable",
 //            [
@@ -4798,12 +4445,8 @@ func (*IPReassemblyEnableDisable) GetCrcString() string {
 func (*IPReassemblyEnableDisable) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewIPReassemblyEnableDisable() api.Message {
-	return &IPReassemblyEnableDisable{}
-}
 
 // IPReassemblyEnableDisableReply represents the VPP binary API message 'ip_reassembly_enable_disable_reply'.
-// Generated from 'ip.api.json', line 2541:
 //
 //            "ip_reassembly_enable_disable_reply",
 //            [
@@ -4835,9 +4478,6 @@ func (*IPReassemblyEnableDisableReply) GetCrcString() string {
 func (*IPReassemblyEnableDisableReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewIPReassemblyEnableDisableReply() api.Message {
-	return &IPReassemblyEnableDisableReply{}
-}
 
 /* Services */
 
diff --git a/examples/bin_api/memif/memif.ba.go b/examples/bin_api/memif/memif.ba.go
index ceb615f..ce8c9c0 100644
--- a/examples/bin_api/memif/memif.ba.go
+++ b/examples/bin_api/memif/memif.ba.go
@@ -1,15 +1,13 @@
 // Code generated by GoVPP binapi-generator. DO NOT EDIT.
-// source: memif.api.json
+//  source: memif.api.json
 
 /*
-Package memif is a generated VPP binary API of the 'memif' VPP module.
+ Package memif is a generated from VPP binary API module 'memif'.
 
-It is generated from this file:
-	memif.api.json
+ It contains following objects:
+	 10 messages
+	  5 services
 
-It contains these VPP binary API objects:
-	10 messages
-	5 services
 */
 package memif
 
@@ -25,7 +23,6 @@ var _ = bytes.NewBuffer
 /* Messages */
 
 // MemifSocketFilenameAddDel represents the VPP binary API message 'memif_socket_filename_add_del'.
-// Generated from 'memif.api.json', line 4:
 //
 //            "memif_socket_filename_add_del",
 //            [
@@ -72,12 +69,8 @@ func (*MemifSocketFilenameAddDel) GetCrcString() string {
 func (*MemifSocketFilenameAddDel) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMemifSocketFilenameAddDel() api.Message {
-	return &MemifSocketFilenameAddDel{}
-}
 
 // MemifSocketFilenameAddDelReply represents the VPP binary API message 'memif_socket_filename_add_del_reply'.
-// Generated from 'memif.api.json', line 35:
 //
 //            "memif_socket_filename_add_del_reply",
 //            [
@@ -109,12 +102,8 @@ func (*MemifSocketFilenameAddDelReply) GetCrcString() string {
 func (*MemifSocketFilenameAddDelReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewMemifSocketFilenameAddDelReply() api.Message {
-	return &MemifSocketFilenameAddDelReply{}
-}
 
 // MemifCreate represents the VPP binary API message 'memif_create'.
-// Generated from 'memif.api.json', line 53:
 //
 //            "memif_create",
 //            [
@@ -197,12 +186,8 @@ func (*MemifCreate) GetCrcString() string {
 func (*MemifCreate) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMemifCreate() api.Message {
-	return &MemifCreate{}
-}
 
 // MemifCreateReply represents the VPP binary API message 'memif_create_reply'.
-// Generated from 'memif.api.json', line 113:
 //
 //            "memif_create_reply",
 //            [
@@ -239,12 +224,8 @@ func (*MemifCreateReply) GetCrcString() string {
 func (*MemifCreateReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewMemifCreateReply() api.Message {
-	return &MemifCreateReply{}
-}
 
 // MemifDelete represents the VPP binary API message 'memif_delete'.
-// Generated from 'memif.api.json', line 135:
 //
 //            "memif_delete",
 //            [
@@ -280,12 +261,8 @@ func (*MemifDelete) GetCrcString() string {
 func (*MemifDelete) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMemifDelete() api.Message {
-	return &MemifDelete{}
-}
 
 // MemifDeleteReply represents the VPP binary API message 'memif_delete_reply'.
-// Generated from 'memif.api.json', line 157:
 //
 //            "memif_delete_reply",
 //            [
@@ -317,12 +294,8 @@ func (*MemifDeleteReply) GetCrcString() string {
 func (*MemifDeleteReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewMemifDeleteReply() api.Message {
-	return &MemifDeleteReply{}
-}
 
 // MemifSocketFilenameDetails represents the VPP binary API message 'memif_socket_filename_details'.
-// Generated from 'memif.api.json', line 175:
 //
 //            "memif_socket_filename_details",
 //            [
@@ -360,12 +333,8 @@ func (*MemifSocketFilenameDetails) GetCrcString() string {
 func (*MemifSocketFilenameDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewMemifSocketFilenameDetails() api.Message {
-	return &MemifSocketFilenameDetails{}
-}
 
 // MemifSocketFilenameDump represents the VPP binary API message 'memif_socket_filename_dump'.
-// Generated from 'memif.api.json', line 198:
 //
 //            "memif_socket_filename_dump",
 //            [
@@ -395,12 +364,8 @@ func (*MemifSocketFilenameDump) GetCrcString() string {
 func (*MemifSocketFilenameDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMemifSocketFilenameDump() api.Message {
-	return &MemifSocketFilenameDump{}
-}
 
 // MemifDetails represents the VPP binary API message 'memif_details'.
-// Generated from 'memif.api.json', line 216:
 //
 //            "memif_details",
 //            [
@@ -484,12 +449,8 @@ func (*MemifDetails) GetCrcString() string {
 func (*MemifDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewMemifDetails() api.Message {
-	return &MemifDetails{}
-}
 
 // MemifDump represents the VPP binary API message 'memif_dump'.
-// Generated from 'memif.api.json', line 276:
 //
 //            "memif_dump",
 //            [
@@ -519,9 +480,6 @@ func (*MemifDump) GetCrcString() string {
 func (*MemifDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewMemifDump() api.Message {
-	return &MemifDump{}
-}
 
 /* Services */
 
diff --git a/examples/bin_api/stats/stats.ba.go b/examples/bin_api/stats/stats.ba.go
index b66a077..58c178f 100644
--- a/examples/bin_api/stats/stats.ba.go
+++ b/examples/bin_api/stats/stats.ba.go
@@ -1,16 +1,14 @@
 // Code generated by GoVPP binapi-generator. DO NOT EDIT.
-// source: stats.api.json
+//  source: stats.api.json
 
 /*
-Package stats is a generated VPP binary API of the 'stats' VPP module.
+ Package stats is a generated from VPP binary API module 'stats'.
 
-It is generated from this file:
-	stats.api.json
+ It contains following objects:
+	 39 messages
+	 10 types
+	 14 services
 
-It contains these VPP binary API objects:
-	39 messages
-	10 types
-	14 services
 */
 package stats
 
@@ -26,7 +24,6 @@ var _ = bytes.NewBuffer
 /* Types */
 
 // VlibCounter represents the VPP binary API type 'vlib_counter'.
-// Generated from 'stats.api.json', line 1004:
 //
 //            "vlib_counter",
 //            [
@@ -54,7 +51,6 @@ func (*VlibCounter) GetCrcString() string {
 }
 
 // VnetCombinedCounter represents the VPP binary API type 'vnet_combined_counter'.
-// Generated from 'stats.api.json', line 1018:
 //
 //            "vnet_combined_counter",
 //            [
@@ -157,7 +153,6 @@ func (*VnetCombinedCounter) GetCrcString() string {
 }
 
 // VnetSimpleCounter represents the VPP binary API type 'vnet_simple_counter'.
-// Generated from 'stats.api.json', line 1092:
 //
 //            "vnet_simple_counter",
 //            [
@@ -225,7 +220,6 @@ func (*VnetSimpleCounter) GetCrcString() string {
 }
 
 // IP4FibCounter represents the VPP binary API type 'ip4_fib_counter'.
-// Generated from 'stats.api.json', line 1138:
 //
 //            "ip4_fib_counter",
 //            [
@@ -263,7 +257,6 @@ func (*IP4FibCounter) GetCrcString() string {
 }
 
 // IP4MfibCounter represents the VPP binary API type 'ip4_mfib_counter'.
-// Generated from 'stats.api.json', line 1160:
 //
 //            "ip4_mfib_counter",
 //            [
@@ -308,7 +301,6 @@ func (*IP4MfibCounter) GetCrcString() string {
 }
 
 // IP4NbrCounter represents the VPP binary API type 'ip4_nbr_counter'.
-// Generated from 'stats.api.json', line 1188:
 //
 //            "ip4_nbr_counter",
 //            [
@@ -346,7 +338,6 @@ func (*IP4NbrCounter) GetCrcString() string {
 }
 
 // IP6FibCounter represents the VPP binary API type 'ip6_fib_counter'.
-// Generated from 'stats.api.json', line 1210:
 //
 //            "ip6_fib_counter",
 //            [
@@ -385,7 +376,6 @@ func (*IP6FibCounter) GetCrcString() string {
 }
 
 // IP6MfibCounter represents the VPP binary API type 'ip6_mfib_counter'.
-// Generated from 'stats.api.json', line 1233:
 //
 //            "ip6_mfib_counter",
 //            [
@@ -430,7 +420,6 @@ func (*IP6MfibCounter) GetCrcString() string {
 }
 
 // IP6NbrCounter represents the VPP binary API type 'ip6_nbr_counter'.
-// Generated from 'stats.api.json', line 1261:
 //
 //            "ip6_nbr_counter",
 //            [
@@ -469,7 +458,6 @@ func (*IP6NbrCounter) GetCrcString() string {
 }
 
 // UDPEncapCounter represents the VPP binary API type 'udp_encap_counter'.
-// Generated from 'stats.api.json', line 1284:
 //
 //            "udp_encap_counter",
 //            [
@@ -504,7 +492,6 @@ func (*UDPEncapCounter) GetCrcString() string {
 /* Messages */
 
 // WantStats represents the VPP binary API message 'want_stats'.
-// Generated from 'stats.api.json', line 4:
 //
 //            "want_stats",
 //            [
@@ -545,12 +532,8 @@ func (*WantStats) GetCrcString() string {
 func (*WantStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantStats() api.Message {
-	return &WantStats{}
-}
 
 // WantStatsReply represents the VPP binary API message 'want_stats_reply'.
-// Generated from 'stats.api.json', line 30:
 //
 //            "want_stats_reply",
 //            [
@@ -582,12 +565,8 @@ func (*WantStatsReply) GetCrcString() string {
 func (*WantStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantStatsReply() api.Message {
-	return &WantStatsReply{}
-}
 
 // WantInterfaceSimpleStats represents the VPP binary API message 'want_interface_simple_stats'.
-// Generated from 'stats.api.json', line 48:
 //
 //            "want_interface_simple_stats",
 //            [
@@ -628,12 +607,8 @@ func (*WantInterfaceSimpleStats) GetCrcString() string {
 func (*WantInterfaceSimpleStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantInterfaceSimpleStats() api.Message {
-	return &WantInterfaceSimpleStats{}
-}
 
 // WantInterfaceSimpleStatsReply represents the VPP binary API message 'want_interface_simple_stats_reply'.
-// Generated from 'stats.api.json', line 74:
 //
 //            "want_interface_simple_stats_reply",
 //            [
@@ -665,12 +640,8 @@ func (*WantInterfaceSimpleStatsReply) GetCrcString() string {
 func (*WantInterfaceSimpleStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantInterfaceSimpleStatsReply() api.Message {
-	return &WantInterfaceSimpleStatsReply{}
-}
 
 // WantPerInterfaceSimpleStats represents the VPP binary API message 'want_per_interface_simple_stats'.
-// Generated from 'stats.api.json', line 92:
 //
 //            "want_per_interface_simple_stats",
 //            [
@@ -723,12 +694,8 @@ func (*WantPerInterfaceSimpleStats) GetCrcString() string {
 func (*WantPerInterfaceSimpleStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantPerInterfaceSimpleStats() api.Message {
-	return &WantPerInterfaceSimpleStats{}
-}
 
 // WantPerInterfaceSimpleStatsReply represents the VPP binary API message 'want_per_interface_simple_stats_reply'.
-// Generated from 'stats.api.json', line 128:
 //
 //            "want_per_interface_simple_stats_reply",
 //            [
@@ -760,12 +727,8 @@ func (*WantPerInterfaceSimpleStatsReply) GetCrcString() string {
 func (*WantPerInterfaceSimpleStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantPerInterfaceSimpleStatsReply() api.Message {
-	return &WantPerInterfaceSimpleStatsReply{}
-}
 
 // WantInterfaceCombinedStats represents the VPP binary API message 'want_interface_combined_stats'.
-// Generated from 'stats.api.json', line 146:
 //
 //            "want_interface_combined_stats",
 //            [
@@ -806,12 +769,8 @@ func (*WantInterfaceCombinedStats) GetCrcString() string {
 func (*WantInterfaceCombinedStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantInterfaceCombinedStats() api.Message {
-	return &WantInterfaceCombinedStats{}
-}
 
 // WantInterfaceCombinedStatsReply represents the VPP binary API message 'want_interface_combined_stats_reply'.
-// Generated from 'stats.api.json', line 172:
 //
 //            "want_interface_combined_stats_reply",
 //            [
@@ -843,12 +802,8 @@ func (*WantInterfaceCombinedStatsReply) GetCrcString() string {
 func (*WantInterfaceCombinedStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantInterfaceCombinedStatsReply() api.Message {
-	return &WantInterfaceCombinedStatsReply{}
-}
 
 // WantPerInterfaceCombinedStats represents the VPP binary API message 'want_per_interface_combined_stats'.
-// Generated from 'stats.api.json', line 190:
 //
 //            "want_per_interface_combined_stats",
 //            [
@@ -901,12 +856,8 @@ func (*WantPerInterfaceCombinedStats) GetCrcString() string {
 func (*WantPerInterfaceCombinedStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantPerInterfaceCombinedStats() api.Message {
-	return &WantPerInterfaceCombinedStats{}
-}
 
 // WantPerInterfaceCombinedStatsReply represents the VPP binary API message 'want_per_interface_combined_stats_reply'.
-// Generated from 'stats.api.json', line 226:
 //
 //            "want_per_interface_combined_stats_reply",
 //            [
@@ -938,12 +889,8 @@ func (*WantPerInterfaceCombinedStatsReply) GetCrcString() string {
 func (*WantPerInterfaceCombinedStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantPerInterfaceCombinedStatsReply() api.Message {
-	return &WantPerInterfaceCombinedStatsReply{}
-}
 
 // WantIP4FibStats represents the VPP binary API message 'want_ip4_fib_stats'.
-// Generated from 'stats.api.json', line 244:
 //
 //            "want_ip4_fib_stats",
 //            [
@@ -984,12 +931,8 @@ func (*WantIP4FibStats) GetCrcString() string {
 func (*WantIP4FibStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantIP4FibStats() api.Message {
-	return &WantIP4FibStats{}
-}
 
 // WantIP4FibStatsReply represents the VPP binary API message 'want_ip4_fib_stats_reply'.
-// Generated from 'stats.api.json', line 270:
 //
 //            "want_ip4_fib_stats_reply",
 //            [
@@ -1021,12 +964,8 @@ func (*WantIP4FibStatsReply) GetCrcString() string {
 func (*WantIP4FibStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantIP4FibStatsReply() api.Message {
-	return &WantIP4FibStatsReply{}
-}
 
 // WantIP6FibStats represents the VPP binary API message 'want_ip6_fib_stats'.
-// Generated from 'stats.api.json', line 288:
 //
 //            "want_ip6_fib_stats",
 //            [
@@ -1067,12 +1006,8 @@ func (*WantIP6FibStats) GetCrcString() string {
 func (*WantIP6FibStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantIP6FibStats() api.Message {
-	return &WantIP6FibStats{}
-}
 
 // WantIP6FibStatsReply represents the VPP binary API message 'want_ip6_fib_stats_reply'.
-// Generated from 'stats.api.json', line 314:
 //
 //            "want_ip6_fib_stats_reply",
 //            [
@@ -1104,12 +1039,8 @@ func (*WantIP6FibStatsReply) GetCrcString() string {
 func (*WantIP6FibStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantIP6FibStatsReply() api.Message {
-	return &WantIP6FibStatsReply{}
-}
 
 // WantIP4MfibStats represents the VPP binary API message 'want_ip4_mfib_stats'.
-// Generated from 'stats.api.json', line 332:
 //
 //            "want_ip4_mfib_stats",
 //            [
@@ -1150,12 +1081,8 @@ func (*WantIP4MfibStats) GetCrcString() string {
 func (*WantIP4MfibStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantIP4MfibStats() api.Message {
-	return &WantIP4MfibStats{}
-}
 
 // WantIP4MfibStatsReply represents the VPP binary API message 'want_ip4_mfib_stats_reply'.
-// Generated from 'stats.api.json', line 358:
 //
 //            "want_ip4_mfib_stats_reply",
 //            [
@@ -1187,12 +1114,8 @@ func (*WantIP4MfibStatsReply) GetCrcString() string {
 func (*WantIP4MfibStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantIP4MfibStatsReply() api.Message {
-	return &WantIP4MfibStatsReply{}
-}
 
 // WantIP6MfibStats represents the VPP binary API message 'want_ip6_mfib_stats'.
-// Generated from 'stats.api.json', line 376:
 //
 //            "want_ip6_mfib_stats",
 //            [
@@ -1233,12 +1156,8 @@ func (*WantIP6MfibStats) GetCrcString() string {
 func (*WantIP6MfibStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantIP6MfibStats() api.Message {
-	return &WantIP6MfibStats{}
-}
 
 // WantIP6MfibStatsReply represents the VPP binary API message 'want_ip6_mfib_stats_reply'.
-// Generated from 'stats.api.json', line 402:
 //
 //            "want_ip6_mfib_stats_reply",
 //            [
@@ -1270,12 +1189,8 @@ func (*WantIP6MfibStatsReply) GetCrcString() string {
 func (*WantIP6MfibStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantIP6MfibStatsReply() api.Message {
-	return &WantIP6MfibStatsReply{}
-}
 
 // WantIP4NbrStats represents the VPP binary API message 'want_ip4_nbr_stats'.
-// Generated from 'stats.api.json', line 420:
 //
 //            "want_ip4_nbr_stats",
 //            [
@@ -1316,12 +1231,8 @@ func (*WantIP4NbrStats) GetCrcString() string {
 func (*WantIP4NbrStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantIP4NbrStats() api.Message {
-	return &WantIP4NbrStats{}
-}
 
 // WantIP4NbrStatsReply represents the VPP binary API message 'want_ip4_nbr_stats_reply'.
-// Generated from 'stats.api.json', line 446:
 //
 //            "want_ip4_nbr_stats_reply",
 //            [
@@ -1353,12 +1264,8 @@ func (*WantIP4NbrStatsReply) GetCrcString() string {
 func (*WantIP4NbrStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantIP4NbrStatsReply() api.Message {
-	return &WantIP4NbrStatsReply{}
-}
 
 // WantIP6NbrStats represents the VPP binary API message 'want_ip6_nbr_stats'.
-// Generated from 'stats.api.json', line 464:
 //
 //            "want_ip6_nbr_stats",
 //            [
@@ -1399,12 +1306,8 @@ func (*WantIP6NbrStats) GetCrcString() string {
 func (*WantIP6NbrStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantIP6NbrStats() api.Message {
-	return &WantIP6NbrStats{}
-}
 
 // WantIP6NbrStatsReply represents the VPP binary API message 'want_ip6_nbr_stats_reply'.
-// Generated from 'stats.api.json', line 490:
 //
 //            "want_ip6_nbr_stats_reply",
 //            [
@@ -1436,12 +1339,8 @@ func (*WantIP6NbrStatsReply) GetCrcString() string {
 func (*WantIP6NbrStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantIP6NbrStatsReply() api.Message {
-	return &WantIP6NbrStatsReply{}
-}
 
 // VnetIP4FibCounters represents the VPP binary API message 'vnet_ip4_fib_counters'.
-// Generated from 'stats.api.json', line 508:
 //
 //            "vnet_ip4_fib_counters",
 //            [
@@ -1481,12 +1380,8 @@ func (*VnetIP4FibCounters) GetCrcString() string {
 func (*VnetIP4FibCounters) GetMessageType() api.MessageType {
 	return api.OtherMessage
 }
-func NewVnetIP4FibCounters() api.Message {
-	return &VnetIP4FibCounters{}
-}
 
 // VnetIP4MfibCounters represents the VPP binary API message 'vnet_ip4_mfib_counters'.
-// Generated from 'stats.api.json', line 532:
 //
 //            "vnet_ip4_mfib_counters",
 //            [
@@ -1526,12 +1421,8 @@ func (*VnetIP4MfibCounters) GetCrcString() string {
 func (*VnetIP4MfibCounters) GetMessageType() api.MessageType {
 	return api.OtherMessage
 }
-func NewVnetIP4MfibCounters() api.Message {
-	return &VnetIP4MfibCounters{}
-}
 
 // VnetIP4NbrCounters represents the VPP binary API message 'vnet_ip4_nbr_counters'.
-// Generated from 'stats.api.json', line 556:
 //
 //            "vnet_ip4_nbr_counters",
 //            [
@@ -1576,12 +1467,8 @@ func (*VnetIP4NbrCounters) GetCrcString() string {
 func (*VnetIP4NbrCounters) GetMessageType() api.MessageType {
 	return api.OtherMessage
 }
-func NewVnetIP4NbrCounters() api.Message {
-	return &VnetIP4NbrCounters{}
-}
 
 // VnetIP6FibCounters represents the VPP binary API message 'vnet_ip6_fib_counters'.
-// Generated from 'stats.api.json', line 584:
 //
 //            "vnet_ip6_fib_counters",
 //            [
@@ -1621,12 +1508,8 @@ func (*VnetIP6FibCounters) GetCrcString() string {
 func (*VnetIP6FibCounters) GetMessageType() api.MessageType {
 	return api.OtherMessage
 }
-func NewVnetIP6FibCounters() api.Message {
-	return &VnetIP6FibCounters{}
-}
 
 // VnetIP6MfibCounters represents the VPP binary API message 'vnet_ip6_mfib_counters'.
-// Generated from 'stats.api.json', line 608:
 //
 //            "vnet_ip6_mfib_counters",
 //            [
@@ -1666,12 +1549,8 @@ func (*VnetIP6MfibCounters) GetCrcString() string {
 func (*VnetIP6MfibCounters) GetMessageType() api.MessageType {
 	return api.OtherMessage
 }
-func NewVnetIP6MfibCounters() api.Message {
-	return &VnetIP6MfibCounters{}
-}
 
 // VnetIP6NbrCounters represents the VPP binary API message 'vnet_ip6_nbr_counters'.
-// Generated from 'stats.api.json', line 632:
 //
 //            "vnet_ip6_nbr_counters",
 //            [
@@ -1716,12 +1595,8 @@ func (*VnetIP6NbrCounters) GetCrcString() string {
 func (*VnetIP6NbrCounters) GetMessageType() api.MessageType {
 	return api.OtherMessage
 }
-func NewVnetIP6NbrCounters() api.Message {
-	return &VnetIP6NbrCounters{}
-}
 
 // VnetInterfaceSimpleCounters represents the VPP binary API message 'vnet_interface_simple_counters'.
-// Generated from 'stats.api.json', line 660:
 //
 //            "vnet_interface_simple_counters",
 //            [
@@ -1766,12 +1641,8 @@ func (*VnetInterfaceSimpleCounters) GetCrcString() string {
 func (*VnetInterfaceSimpleCounters) GetMessageType() api.MessageType {
 	return api.OtherMessage
 }
-func NewVnetInterfaceSimpleCounters() api.Message {
-	return &VnetInterfaceSimpleCounters{}
-}
 
 // VnetInterfaceCombinedCounters represents the VPP binary API message 'vnet_interface_combined_counters'.
-// Generated from 'stats.api.json', line 688:
 //
 //            "vnet_interface_combined_counters",
 //            [
@@ -1816,12 +1687,8 @@ func (*VnetInterfaceCombinedCounters) GetCrcString() string {
 func (*VnetInterfaceCombinedCounters) GetMessageType() api.MessageType {
 	return api.OtherMessage
 }
-func NewVnetInterfaceCombinedCounters() api.Message {
-	return &VnetInterfaceCombinedCounters{}
-}
 
 // VnetPerInterfaceSimpleCounters represents the VPP binary API message 'vnet_per_interface_simple_counters'.
-// Generated from 'stats.api.json', line 716:
 //
 //            "vnet_per_interface_simple_counters",
 //            [
@@ -1861,12 +1728,8 @@ func (*VnetPerInterfaceSimpleCounters) GetCrcString() string {
 func (*VnetPerInterfaceSimpleCounters) GetMessageType() api.MessageType {
 	return api.OtherMessage
 }
-func NewVnetPerInterfaceSimpleCounters() api.Message {
-	return &VnetPerInterfaceSimpleCounters{}
-}
 
 // VnetPerInterfaceCombinedCounters represents the VPP binary API message 'vnet_per_interface_combined_counters'.
-// Generated from 'stats.api.json', line 740:
 //
 //            "vnet_per_interface_combined_counters",
 //            [
@@ -1906,12 +1769,8 @@ func (*VnetPerInterfaceCombinedCounters) GetCrcString() string {
 func (*VnetPerInterfaceCombinedCounters) GetMessageType() api.MessageType {
 	return api.OtherMessage
 }
-func NewVnetPerInterfaceCombinedCounters() api.Message {
-	return &VnetPerInterfaceCombinedCounters{}
-}
 
 // VnetGetSummaryStats represents the VPP binary API message 'vnet_get_summary_stats'.
-// Generated from 'stats.api.json', line 764:
 //
 //            "vnet_get_summary_stats",
 //            [
@@ -1941,12 +1800,8 @@ func (*VnetGetSummaryStats) GetCrcString() string {
 func (*VnetGetSummaryStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewVnetGetSummaryStats() api.Message {
-	return &VnetGetSummaryStats{}
-}
 
 // VnetGetSummaryStatsReply represents the VPP binary API message 'vnet_get_summary_stats_reply'.
-// Generated from 'stats.api.json', line 782:
 //
 //            "vnet_get_summary_stats_reply",
 //            [
@@ -1995,12 +1850,8 @@ func (*VnetGetSummaryStatsReply) GetCrcString() string {
 func (*VnetGetSummaryStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewVnetGetSummaryStatsReply() api.Message {
-	return &VnetGetSummaryStatsReply{}
-}
 
 // StatsGetPollerDelay represents the VPP binary API message 'stats_get_poller_delay'.
-// Generated from 'stats.api.json', line 814:
 //
 //            "stats_get_poller_delay",
 //            [
@@ -2030,12 +1881,8 @@ func (*StatsGetPollerDelay) GetCrcString() string {
 func (*StatsGetPollerDelay) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewStatsGetPollerDelay() api.Message {
-	return &StatsGetPollerDelay{}
-}
 
 // StatsGetPollerDelayReply represents the VPP binary API message 'stats_get_poller_delay_reply'.
-// Generated from 'stats.api.json', line 832:
 //
 //            "stats_get_poller_delay_reply",
 //            [
@@ -2072,12 +1919,8 @@ func (*StatsGetPollerDelayReply) GetCrcString() string {
 func (*StatsGetPollerDelayReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewStatsGetPollerDelayReply() api.Message {
-	return &StatsGetPollerDelayReply{}
-}
 
 // WantUDPEncapStats represents the VPP binary API message 'want_udp_encap_stats'.
-// Generated from 'stats.api.json', line 854:
 //
 //            "want_udp_encap_stats",
 //            [
@@ -2118,12 +1961,8 @@ func (*WantUDPEncapStats) GetCrcString() string {
 func (*WantUDPEncapStats) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewWantUDPEncapStats() api.Message {
-	return &WantUDPEncapStats{}
-}
 
 // WantUDPEncapStatsReply represents the VPP binary API message 'want_udp_encap_stats_reply'.
-// Generated from 'stats.api.json', line 880:
 //
 //            "want_udp_encap_stats_reply",
 //            [
@@ -2155,12 +1994,8 @@ func (*WantUDPEncapStatsReply) GetCrcString() string {
 func (*WantUDPEncapStatsReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewWantUDPEncapStatsReply() api.Message {
-	return &WantUDPEncapStatsReply{}
-}
 
 // VnetUDPEncapCounters represents the VPP binary API message 'vnet_udp_encap_counters'.
-// Generated from 'stats.api.json', line 898:
 //
 //            "vnet_udp_encap_counters",
 //            [
@@ -2200,9 +2035,6 @@ func (*VnetUDPEncapCounters) GetCrcString() string {
 func (*VnetUDPEncapCounters) GetMessageType() api.MessageType {
 	return api.OtherMessage
 }
-func NewVnetUDPEncapCounters() api.Message {
-	return &VnetUDPEncapCounters{}
-}
 
 /* Services */
 
diff --git a/examples/bin_api/tap/tap.ba.go b/examples/bin_api/tap/tap.ba.go
index d2878ea..d4daa1d 100644
--- a/examples/bin_api/tap/tap.ba.go
+++ b/examples/bin_api/tap/tap.ba.go
@@ -1,15 +1,13 @@
 // Code generated by GoVPP binapi-generator. DO NOT EDIT.
-// source: tap.api.json
+//  source: tap.api.json
 
 /*
-Package tap is a generated VPP binary API of the 'tap' VPP module.
+ Package tap is a generated from VPP binary API module 'tap'.
 
-It is generated from this file:
-	tap.api.json
+ It contains following objects:
+	  8 messages
+	  4 services
 
-It contains these VPP binary API objects:
-	8 messages
-	4 services
 */
 package tap
 
@@ -25,7 +23,6 @@ var _ = bytes.NewBuffer
 /* Messages */
 
 // TapConnect represents the VPP binary API message 'tap_connect'.
-// Generated from 'tap.api.json', line 4:
 //
 //            "tap_connect",
 //            [
@@ -121,12 +118,8 @@ func (*TapConnect) GetCrcString() string {
 func (*TapConnect) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewTapConnect() api.Message {
-	return &TapConnect{}
-}
 
 // TapConnectReply represents the VPP binary API message 'tap_connect_reply'.
-// Generated from 'tap.api.json', line 75:
 //
 //            "tap_connect_reply",
 //            [
@@ -163,12 +156,8 @@ func (*TapConnectReply) GetCrcString() string {
 func (*TapConnectReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewTapConnectReply() api.Message {
-	return &TapConnectReply{}
-}
 
 // TapModify represents the VPP binary API message 'tap_modify'.
-// Generated from 'tap.api.json', line 97:
 //
 //            "tap_modify",
 //            [
@@ -231,12 +220,8 @@ func (*TapModify) GetCrcString() string {
 func (*TapModify) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewTapModify() api.Message {
-	return &TapModify{}
-}
 
 // TapModifyReply represents the VPP binary API message 'tap_modify_reply'.
-// Generated from 'tap.api.json', line 141:
 //
 //            "tap_modify_reply",
 //            [
@@ -273,12 +258,8 @@ func (*TapModifyReply) GetCrcString() string {
 func (*TapModifyReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewTapModifyReply() api.Message {
-	return &TapModifyReply{}
-}
 
 // TapDelete represents the VPP binary API message 'tap_delete'.
-// Generated from 'tap.api.json', line 163:
 //
 //            "tap_delete",
 //            [
@@ -314,12 +295,8 @@ func (*TapDelete) GetCrcString() string {
 func (*TapDelete) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewTapDelete() api.Message {
-	return &TapDelete{}
-}
 
 // TapDeleteReply represents the VPP binary API message 'tap_delete_reply'.
-// Generated from 'tap.api.json', line 185:
 //
 //            "tap_delete_reply",
 //            [
@@ -351,12 +328,8 @@ func (*TapDeleteReply) GetCrcString() string {
 func (*TapDeleteReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewTapDeleteReply() api.Message {
-	return &TapDeleteReply{}
-}
 
 // SwInterfaceTapDump represents the VPP binary API message 'sw_interface_tap_dump'.
-// Generated from 'tap.api.json', line 203:
 //
 //            "sw_interface_tap_dump",
 //            [
@@ -386,12 +359,8 @@ func (*SwInterfaceTapDump) GetCrcString() string {
 func (*SwInterfaceTapDump) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewSwInterfaceTapDump() api.Message {
-	return &SwInterfaceTapDump{}
-}
 
 // SwInterfaceTapDetails represents the VPP binary API message 'sw_interface_tap_details'.
-// Generated from 'tap.api.json', line 221:
 //
 //            "sw_interface_tap_details",
 //            [
@@ -429,9 +398,6 @@ func (*SwInterfaceTapDetails) GetCrcString() string {
 func (*SwInterfaceTapDetails) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewSwInterfaceTapDetails() api.Message {
-	return &SwInterfaceTapDetails{}
-}
 
 /* Services */
 
diff --git a/examples/bin_api/vpe/vpe.ba.go b/examples/bin_api/vpe/vpe.ba.go
index 50476c3..fe0fa03 100644
--- a/examples/bin_api/vpe/vpe.ba.go
+++ b/examples/bin_api/vpe/vpe.ba.go
@@ -1,15 +1,13 @@
 // Code generated by GoVPP binapi-generator. DO NOT EDIT.
-// source: vpe.api.json
+//  source: vpe.api.json
 
 /*
-Package vpe is a generated VPP binary API of the 'vpe' VPP module.
+ Package vpe is a generated from VPP binary API module 'vpe'.
 
-It is generated from this file:
-	vpe.api.json
+ It contains following objects:
+	 16 messages
+	  8 services
 
-It contains these VPP binary API objects:
-	16 messages
-	8 services
 */
 package vpe
 
@@ -25,7 +23,6 @@ var _ = bytes.NewBuffer
 /* Messages */
 
 // ControlPing represents the VPP binary API message 'control_ping'.
-// Generated from 'vpe.api.json', line 4:
 //
 //            "control_ping",
 //            [
@@ -55,12 +52,8 @@ func (*ControlPing) GetCrcString() string {
 func (*ControlPing) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewControlPing() api.Message {
-	return &ControlPing{}
-}
 
 // ControlPingReply represents the VPP binary API message 'control_ping_reply'.
-// Generated from 'vpe.api.json', line 22:
 //
 //            "control_ping_reply",
 //            [
@@ -102,12 +95,8 @@ func (*ControlPingReply) GetCrcString() string {
 func (*ControlPingReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewControlPingReply() api.Message {
-	return &ControlPingReply{}
-}
 
 // Cli represents the VPP binary API message 'cli'.
-// Generated from 'vpe.api.json', line 48:
 //
 //            "cli",
 //            [
@@ -143,12 +132,8 @@ func (*Cli) GetCrcString() string {
 func (*Cli) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewCli() api.Message {
-	return &Cli{}
-}
 
 // CliInband represents the VPP binary API message 'cli_inband'.
-// Generated from 'vpe.api.json', line 70:
 //
 //            "cli_inband",
 //            [
@@ -191,12 +176,8 @@ func (*CliInband) GetCrcString() string {
 func (*CliInband) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewCliInband() api.Message {
-	return &CliInband{}
-}
 
 // CliReply represents the VPP binary API message 'cli_reply'.
-// Generated from 'vpe.api.json', line 98:
 //
 //            "cli_reply",
 //            [
@@ -233,12 +214,8 @@ func (*CliReply) GetCrcString() string {
 func (*CliReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewCliReply() api.Message {
-	return &CliReply{}
-}
 
 // CliInbandReply represents the VPP binary API message 'cli_inband_reply'.
-// Generated from 'vpe.api.json', line 120:
 //
 //            "cli_inband_reply",
 //            [
@@ -282,12 +259,8 @@ func (*CliInbandReply) GetCrcString() string {
 func (*CliInbandReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewCliInbandReply() api.Message {
-	return &CliInbandReply{}
-}
 
 // GetNodeIndex represents the VPP binary API message 'get_node_index'.
-// Generated from 'vpe.api.json', line 148:
 //
 //            "get_node_index",
 //            [
@@ -324,12 +297,8 @@ func (*GetNodeIndex) GetCrcString() string {
 func (*GetNodeIndex) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewGetNodeIndex() api.Message {
-	return &GetNodeIndex{}
-}
 
 // GetNodeIndexReply represents the VPP binary API message 'get_node_index_reply'.
-// Generated from 'vpe.api.json', line 171:
 //
 //            "get_node_index_reply",
 //            [
@@ -366,12 +335,8 @@ func (*GetNodeIndexReply) GetCrcString() string {
 func (*GetNodeIndexReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewGetNodeIndexReply() api.Message {
-	return &GetNodeIndexReply{}
-}
 
 // AddNodeNext represents the VPP binary API message 'add_node_next'.
-// Generated from 'vpe.api.json', line 193:
 //
 //            "add_node_next",
 //            [
@@ -414,12 +379,8 @@ func (*AddNodeNext) GetCrcString() string {
 func (*AddNodeNext) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewAddNodeNext() api.Message {
-	return &AddNodeNext{}
-}
 
 // AddNodeNextReply represents the VPP binary API message 'add_node_next_reply'.
-// Generated from 'vpe.api.json', line 221:
 //
 //            "add_node_next_reply",
 //            [
@@ -456,12 +417,8 @@ func (*AddNodeNextReply) GetCrcString() string {
 func (*AddNodeNextReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewAddNodeNextReply() api.Message {
-	return &AddNodeNextReply{}
-}
 
 // ShowVersion represents the VPP binary API message 'show_version'.
-// Generated from 'vpe.api.json', line 243:
 //
 //            "show_version",
 //            [
@@ -491,12 +448,8 @@ func (*ShowVersion) GetCrcString() string {
 func (*ShowVersion) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewShowVersion() api.Message {
-	return &ShowVersion{}
-}
 
 // ShowVersionReply represents the VPP binary API message 'show_version_reply'.
-// Generated from 'vpe.api.json', line 261:
 //
 //            "show_version_reply",
 //            [
@@ -552,12 +505,8 @@ func (*ShowVersionReply) GetCrcString() string {
 func (*ShowVersionReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewShowVersionReply() api.Message {
-	return &ShowVersionReply{}
-}
 
 // GetNodeGraph represents the VPP binary API message 'get_node_graph'.
-// Generated from 'vpe.api.json', line 299:
 //
 //            "get_node_graph",
 //            [
@@ -587,12 +536,8 @@ func (*GetNodeGraph) GetCrcString() string {
 func (*GetNodeGraph) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewGetNodeGraph() api.Message {
-	return &GetNodeGraph{}
-}
 
 // GetNodeGraphReply represents the VPP binary API message 'get_node_graph_reply'.
-// Generated from 'vpe.api.json', line 317:
 //
 //            "get_node_graph_reply",
 //            [
@@ -629,12 +574,8 @@ func (*GetNodeGraphReply) GetCrcString() string {
 func (*GetNodeGraphReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewGetNodeGraphReply() api.Message {
-	return &GetNodeGraphReply{}
-}
 
 // GetNextIndex represents the VPP binary API message 'get_next_index'.
-// Generated from 'vpe.api.json', line 339:
 //
 //            "get_next_index",
 //            [
@@ -677,12 +618,8 @@ func (*GetNextIndex) GetCrcString() string {
 func (*GetNextIndex) GetMessageType() api.MessageType {
 	return api.RequestMessage
 }
-func NewGetNextIndex() api.Message {
-	return &GetNextIndex{}
-}
 
 // GetNextIndexReply represents the VPP binary API message 'get_next_index_reply'.
-// Generated from 'vpe.api.json', line 367:
 //
 //            "get_next_index_reply",
 //            [
@@ -719,9 +656,6 @@ func (*GetNextIndexReply) GetCrcString() string {
 func (*GetNextIndexReply) GetMessageType() api.MessageType {
 	return api.ReplyMessage
 }
-func NewGetNextIndexReply() api.Message {
-	return &GetNextIndexReply{}
-}
 
 /* Services */