(PDB-467) Convert endpoints to vecs of vecs

Also remove one commented end-point.

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