bug 14918 part 4: more cleanups (WIP)
12 files changed