bug 838983: cleanups for bug 825471 6a1aacd6b34ec8cfce1fe2875de45279c8254b54
Merge pull request #741 from erikvold/cleanups

Bug 838983: cleanups for bug 825471 6a1aacd r=@Gozala