clean up and prep for bug 339818
2 files changed