Wip dz scrub fixes

Can't reproduce the assert(deep_scrub) and the code looks right.  Reverting it and improving log output.