Bug 941868 - Part 5a: uncontested cleanup and logging. r=mcomella