Index: scripts/MsgUtils/msgutils/templates/MsgDefs_h.jinja
===================================================================
diff -u -r53d80d0edc1c441132b13f387f5f13570a7aafd2 -rf9c6b488aa4135e8cd47ccd3fdc6c3ae1cd831aa
--- scripts/MsgUtils/msgutils/templates/MsgDefs_h.jinja	(.../MsgDefs_h.jinja)	(revision 53d80d0edc1c441132b13f387f5f13570a7aafd2)
+++ scripts/MsgUtils/msgutils/templates/MsgDefs_h.jinja	(.../MsgDefs_h.jinja)	(revision f9c6b488aa4135e8cd47ccd3fdc6c3ae1cd831aa)
@@ -10,9 +10,6 @@
 
 #include "CanMessage.h"
 #include "types.h"
-{%- if proto is defined %}
-#include "{{ device_name }}MsgDefs.pb.h"
-{%- endif %}
 
 {%- if cpp_namespace is defined and cpp_namespace is not none %}
 
@@ -73,29 +70,11 @@
 {%-     endfor %}
 {%-     if msg['cpp_struct']['payload'] | length %}
 {%      endif %}
-{%-     if proto is defined %}
-{%-         if cpp_namespace is defined and cpp_namespace is not none %}
-    void fromProtobuf(const {{ cpp_namespace }}::messages::{{ msg['msg_name'] }} &src);
-{%-         else %}
-    void fromProtobuf(const messages::{{ msg['msg_name'] }} &src);
-{%-         endif %}
-{%-     endif %}
     bool fromQByteArray(const QByteArray &src);
-{%-     if proto is defined %}
-{%-         if cpp_namespace is defined and cpp_namespace is not none %}
-    {{ cpp_namespace }}::messages::{{ msg['msg_name'] }} toProtobuf() const;
-{%-         else %}
-    messages::{{ msg['msg_name'] }} toProtobuf() const;
-{%-         endif %}
-{%-     endif %}
     void toQByteArray(QByteArray &dst) const;
     void dump() const;
 };
 {%- endfor %}
-{%- if proto is defined %}
-
-QByteArray canMessageToProtobufByteArray(const QDateTime &timestamp, const QString &deviceSerialNumber, const Can::Message &msg);
-{%- endif %}
 {%- if cpp_namespace is defined and cpp_namespace is not none %}
 
 } // namespace {{ cpp_namespace }}