Update on scavenger work

Ok, so now we put in another set of cleanups that deleted another ~400 LOC. The total code deletion from the scavenger work is now close to 1000 LOC. And note that this figure does not reveal what truly happened because I had to add a significant amount of code to fix problems that will no longer occur...