diff --git a/internal/scti/handlers.go b/internal/scti/handlers.go
index a927043a..83edb604 100644
--- a/internal/scti/handlers.go
+++ b/internal/scti/handlers.go
@@ -334,7 +334,6 @@ func addChainInternal(ctx context.Context, opts *HandlerOptions, log *log, w htt
 
 	// As the Log server has definitely got the Merkle tree leaf, we can
 	// generate an SCT and respond with it.
-	// TODO(phboneff): this should work, but double check
 	sct, err := log.signSCT(&loggedLeaf)
 	if err != nil {
 		return http.StatusInternalServerError, fmt.Errorf("failed to generate SCT: %s", err)
diff --git a/internal/scti/signatures.go b/internal/scti/signatures.go
index 6807c0e4..dff307a8 100644
--- a/internal/scti/signatures.go
+++ b/internal/scti/signatures.go
@@ -196,7 +196,6 @@ func (cts *cpSigner) Sign(msg []byte) ([]byte, error) {
 		return nil, fmt.Errorf("checkpoint's origin %s doesn't match signer's origin %s", ckpt.Origin, cts.origin)
 	}
 
-	// TODO(phboneff): make sure that it's ok to generate the timestamp here
 	t := uint64(cts.timeSource.Now().UnixMilli())
 	sig, err := buildCp(cts.sthSigner, ckpt.Size, t, ckpt.Hash[:])
 	if err != nil {
@@ -240,7 +239,6 @@ func NewCpSigner(cs crypto.Signer, origin string, timeSource TimeSource) (note.S
 
 // getCTLogID takes a log public key and returns the LogID. (see RFC 6962 S3.2)
 // In CT V1 the log id is a hash of the public key.
-// TODO(phboneff): migrate to the logid package
 func getCTLogID(pk crypto.PublicKey) ([sha256.Size]byte, error) {
 	pubBytes, err := x509.MarshalPKIXPublicKey(pk)
 	if err != nil {
diff --git a/internal/types/rfc6962/rfc6962.go b/internal/types/rfc6962/rfc6962.go
index 1b535556..3c392f54 100644
--- a/internal/types/rfc6962/rfc6962.go
+++ b/internal/types/rfc6962/rfc6962.go
@@ -114,7 +114,6 @@ type ASN1Cert struct {
 }
 
 // LogID holds the hash of the Log's public key (section 3.2).
-// TODO(pphaneuf): Users should be migrated to the one in the logid package.
 type LogID struct {
 	KeyID [sha256.Size]byte
 }