PDB-234 Remove remaining TODO comments

Signed-off-by: Ken Barber <ken@bob.sh>