PDB ui cleanup