Bug 850572: first round of cleanup