Cleanup patch from Larry
3 files changed