removed an errant (but commented) PDB

also, some logic tweaks around lookups