I also completed my comment about the protocol templates, and I removed a piece of Elisp code not used anymore