Feature #6481 Remove unused TODO refs #6481

1 job for F6481-custom-primary-key in 1 minute and 40 seconds (queued for 5 seconds)