clean up and prep for bug 339818
30 files changed