(PDB-708) Merge old migration and remove some todos

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