Be more agressive about removing lockdb when things go poorly