diff --git a/requests_copy.go b/requests_copy.go
index 6fcb94b..5ee74e9 100644
--- a/requests_copy.go
+++ b/requests_copy.go
@@ -847,7 +847,6 @@ func copyDstSubProcFunc(proc process, cia copyInitialData, message Message, canc
 						proc.errorKernel.logDebug(er)
 
 						if _, err := os.Stat(cia.DstDir); os.IsNotExist(err) {
-							// TODO: Add option to set permission here ???
 							err := os.MkdirAll(cia.DstDir, fs.FileMode(cia.FolderPermission))
 							if err != nil {
 								return fmt.Errorf("error: failed to create destination directory for file copying %v: %v", cia.DstDir, err)
diff --git a/requests_keys.go b/requests_keys.go
index e222fb5..6df557a 100644
--- a/requests_keys.go
+++ b/requests_keys.go
@@ -125,10 +125,6 @@ func methodKeysRequestUpdate(proc process, message Message, node string) ([]byte
 func methodKeysDeliverUpdate(proc process, message Message, node string) ([]byte, error) {
 	// Get a context with the timeout specified in message.MethodTimeout.
 
-	// TODO:
-	// - Since this is implemented as a NACK message we could implement a
-	//   metric thats shows the last time keys were updated.
-
 	ctx, _ := getContextForMethodTimeout(proc.ctx, message)
 
 	proc.processes.wg.Add(1)
diff --git a/server.go b/server.go
index 37ed884..437149e 100644
--- a/server.go
+++ b/server.go
@@ -495,9 +495,6 @@ func (s *server) routeMessagesToProcess() {
 		for sam := range s.newMessagesCh {
 
 			go func(sam subjectAndMessage) {
-				// TODO: Jetstream
-				// Check if Jetstream stream are specified,
-				// and send off to Jetstream publisher.
 
 				s.messageID.mu.Lock()
 				s.messageID.id++