diff --git a/src/backend/copy.go b/src/backend/copy.go
index 6794c3a..cb3cf75 100644
--- a/src/backend/copy.go
+++ b/src/backend/copy.go
@@ -26,17 +26,17 @@ func CopyArgument(targetLocation string, field int, executableName string) {
 				os.Exit(1)
 			}
 
-			if field != 5 { // TODO Update field after removed from notes (breaking sshyp entry compatibility)
+			if field != 2 {
 				copySubject = decryptedEntry[field]
 			} else { // TOTP mode
 				var secret string // stores secret for TOTP generation
 				var forSteam bool // indicates whether to generate TOTP in Steam format
 
-				if strings.HasPrefix(decryptedEntry[5], "steam@") {
-					secret = decryptedEntry[5][6:]
+				if strings.HasPrefix(decryptedEntry[2], "steam@") {
+					secret = decryptedEntry[2][6:]
 					forSteam = true
 				} else {
-					secret = decryptedEntry[5]
+					secret = decryptedEntry[2]
 				}
 
 				for { // keep field copied to clipboard, refresh on 30-second intervals
diff --git a/src/backend/edit.go b/src/backend/edit.go
index 09e3155..714a49f 100644
--- a/src/backend/edit.go
+++ b/src/backend/edit.go
@@ -36,7 +36,7 @@ func Rename(oldLocation string, newLocation string) {
 		fmt.Println(AnsiError + "Failed to rename - does the target containing directory exists?" + AnsiReset)
 	}
 
-	// TODO If in online mode, rename oldLocation to newLocation on the server
+	// TODO implement synced renaming
 	os.Exit(0)
 }
 
diff --git a/src/backend/gpg.go b/src/backend/gpg.go
index 6ad1f33..24edb69 100644
--- a/src/backend/gpg.go
+++ b/src/backend/gpg.go
@@ -8,7 +8,7 @@ import (
 )
 
 // TODO GPG support is a temporary feature - it will be replaced with a different encryption scheme in the future
-// TODO These functions may continue to exist after that point, but consider them deprecated
+// These functions may continue to exist after that point, but consider them deprecated
 
 // DecryptGPG decrypts a GPG-encrypted file and returns the contents as a slice of (trimmed) strings
 func DecryptGPG(targetLocation string) []string {