a few cleanups while mergeing the passdb code into 2.2