SERVER-12532 lots of cleanup; just a bit more testing left