diff --git a/src/vpp-api/java/jvpp-acl/jvpp_acl.c b/src/vpp-api/java/jvpp-acl/jvpp_acl.c
index b59f535..0375356 100644
--- a/src/vpp-api/java/jvpp-acl/jvpp_acl.c
+++ b/src/vpp-api/java/jvpp-acl/jvpp_acl.c
@@ -20,15 +20,6 @@
 #include <acl/acl_all_api_h.h>
 #undef vl_typedefs
 
-#define vl_endianfun
-#include <acl/acl_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <acl/acl_all_api_h.h>
-#undef vl_printfun
-
 #include <vnet/api_errno.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
@@ -71,8 +62,8 @@
       vl_msg_api_set_handlers(get_message_id(env, #N), #n,     \
               vl_api_##n##_t_handler,             \
               vl_noop_handler,                    \
-              vl_api_##n##_t_endian,              \
-              vl_api_##n##_t_print,               \
+              vl_noop_handler,                    \
+              vl_noop_handler,                    \
               sizeof(vl_api_##n##_t), 1);
       foreach_api_reply_handler;
   #undef _
diff --git a/src/vpp-api/java/jvpp-core/jvpp_core.c b/src/vpp-api/java/jvpp-core/jvpp_core.c
index 8c57981..627bc10 100644
--- a/src/vpp-api/java/jvpp-core/jvpp_core.c
+++ b/src/vpp-api/java/jvpp-core/jvpp_core.c
@@ -20,15 +20,6 @@
 #include <vpp/api/vpe_all_api_h.h>
 #undef vl_typedefs
 
-#define vl_endianfun
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_printfun
-
 #include <vnet/api_errno.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
diff --git a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c
index bf0e9f0..9131ccb 100644
--- a/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c
+++ b/src/vpp-api/java/jvpp-ioamexport/jvpp_ioam_export.c
@@ -20,15 +20,6 @@
 #include <ioam/export/ioam_export_all_api_h.h>
 #undef vl_typedefs
 
-#define vl_endianfun
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/export/ioam_export_all_api_h.h>
-#undef vl_printfun
-
 #include <vnet/api_errno.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
@@ -71,8 +62,8 @@
       vl_msg_api_set_handlers(get_message_id(env, #N), #n,     \
               vl_api_##n##_t_handler,             \
               vl_noop_handler,                    \
-              vl_api_##n##_t_endian,              \
-              vl_api_##n##_t_print,               \
+              vl_noop_handler,                    \
+              vl_noop_handler,                    \
               sizeof(vl_api_##n##_t), 1);
       foreach_api_reply_handler;
   #undef _
diff --git a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
index f7e2b90..5f28344 100644
--- a/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
+++ b/src/vpp-api/java/jvpp-ioampot/jvpp_ioam_pot.c
@@ -20,15 +20,6 @@
 #include <ioam/lib-pot/pot_all_api_h.h>
 #undef vl_typedefs
 
-#define vl_endianfun
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/lib-pot/pot_all_api_h.h>
-#undef vl_printfun
-
 #include <vnet/api_errno.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
@@ -71,8 +62,8 @@
       vl_msg_api_set_handlers(get_message_id(env, #N), #n,     \
               vl_api_##n##_t_handler,             \
               vl_noop_handler,                    \
-              vl_api_##n##_t_endian,              \
-              vl_api_##n##_t_print,               \
+              vl_noop_handler,                    \
+              vl_noop_handler,                    \
               sizeof(vl_api_##n##_t), 1);
       foreach_api_reply_handler;
   #undef _
diff --git a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c b/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c
index 5a0fda6..1c470b5 100644
--- a/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c
+++ b/src/vpp-api/java/jvpp-ioamtrace/jvpp_ioam_trace.c
@@ -20,15 +20,6 @@
 #include <ioam/lib-trace/trace_all_api_h.h>
 #undef vl_typedefs
 
-#define vl_endianfun
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <ioam/lib-trace/trace_all_api_h.h>
-#undef vl_printfun
-
 #include <vnet/api_errno.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
@@ -71,8 +62,8 @@
       vl_msg_api_set_handlers(get_message_id(env, #N), #n,     \
               vl_api_##n##_t_handler,             \
               vl_noop_handler,                    \
-              vl_api_##n##_t_endian,              \
-              vl_api_##n##_t_print,               \
+              vl_noop_handler,                    \
+              vl_noop_handler,                    \
               sizeof(vl_api_##n##_t), 1);
       foreach_api_reply_handler;
   #undef _
diff --git a/src/vpp-api/java/jvpp-snat/jvpp_snat.c b/src/vpp-api/java/jvpp-snat/jvpp_snat.c
index 3126577..e994cdb 100644
--- a/src/vpp-api/java/jvpp-snat/jvpp_snat.c
+++ b/src/vpp-api/java/jvpp-snat/jvpp_snat.c
@@ -20,15 +20,6 @@
 #include <snat/snat_all_api_h.h>
 #undef vl_typedefs
 
-#define vl_endianfun
-#include <snat/snat_all_api_h.h>
-#undef vl_endianfun
-
-#define vl_print(handle, ...)
-#define vl_printfun
-#include <snat/snat_all_api_h.h>
-#undef vl_printfun
-
 #include <vnet/api_errno.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
@@ -71,8 +62,8 @@
       vl_msg_api_set_handlers(get_message_id(env, #N), #n,     \
               vl_api_##n##_t_handler,             \
               vl_noop_handler,                    \
-              vl_api_##n##_t_endian,              \
-              vl_api_##n##_t_print,               \
+              vl_noop_handler,                    \
+              vl_noop_handler,                    \
               sizeof(vl_api_##n##_t), 1);
       foreach_api_reply_handler;
   #undef _