diff --git a/README.md b/README.md
index 96afd5f..3b9a1c5 100644
--- a/README.md
+++ b/README.md
@@ -931,7 +931,6 @@ Method Method `json:"method" yaml:"method"`
 // Additional arguments that might be needed when executing the
 // method. Can be f.ex. an ip address if it is a tcp sender, or the
 // shell command to execute in a cli session.
-// TODO:
 MethodArgs []string `json:"methodArgs" yaml:"methodArgs"`
 // ReplyMethod, is the method to use for the reply message.
 // By default the reply method will be set to log to file, but
@@ -940,7 +939,6 @@ ReplyMethod Method `json:"replyMethod" yaml:"replyMethod"`
 // Additional arguments that might be needed when executing the reply
 // method. Can be f.ex. an ip address if it is a tcp sender, or the
 // shell command to execute in a cli session.
-// TODO:
 ReplyMethodArgs []string `json:"replyMethodArgs" yaml:"replyMethodArgs"`
 // IsReply are used to tell that this is a reply message. By default
 // the system sends the output of a request method back to the node
diff --git a/message_and_subject.go b/message_and_subject.go
index c9ed378..99b56c0 100644
--- a/message_and_subject.go
+++ b/message_and_subject.go
@@ -27,7 +27,6 @@ type Message struct {
 	// Additional arguments that might be needed when executing the
 	// method. Can be f.ex. an ip address if it is a tcp sender, or the
 	// shell command to execute in a cli session.
-	// TODO:
 	MethodArgs []string `json:"methodArgs" yaml:"methodArgs"`
 	// ReplyMethod, is the method to use for the reply message.
 	// By default the reply method will be set to log to file, but
@@ -36,7 +35,6 @@ type Message struct {
 	// Additional arguments that might be needed when executing the reply
 	// method. Can be f.ex. an ip address if it is a tcp sender, or the
 	// shell command to execute in a cli session.
-	// TODO:
 	ReplyMethodArgs []string `json:"replyMethodArgs" yaml:"replyMethodArgs"`
 	// IsReply are used to tell that this is a reply message. By default
 	// the system sends the output of a request method back to the node
diff --git a/process.go b/process.go
index 3deab76..dfd4cba 100644
--- a/process.go
+++ b/process.go
@@ -643,9 +643,6 @@ func (p process) publishMessages(natsConn *nats.Conn) {
 		m.done <- struct{}{}
 
 		// Increment the counter for the next message to be sent.
-		//
-		// TODO: Check if it is possible, or makes sense to move the
-		// counter out of the map.
 		p.messageID++
 
 		{
diff --git a/requests.go b/requests.go
index 4b00996..5a49de2 100644
--- a/requests.go
+++ b/requests.go
@@ -733,7 +733,6 @@ func (m methodREQCopyFileFrom) handler(proc process, message Message, node strin
 			dstFile := filepath.Base(DstFilePath)
 
 			// Prepare for sending a new message with the output
-			// TODO: Maybe changing the type of Message.Data to []byte ?
 
 			// Copy the original message to get the defaults for timeouts etc,
 			// and set new values for fields to change.
@@ -1605,7 +1604,7 @@ func (m methodREQToSocket) getKind() CommandOrEvent {
 	return m.commandOrEvent
 }
 
-// TODO:
+// TODO: Not implemented.
 // Handler to write to unix socket file.
 func (m methodREQToSocket) handler(proc process, message Message, node string) ([]byte, error) {