(PDB-708) cleanup after rebase

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