Remove pdb code (oops)
Cleanup and adding a separate config setting for VAL.