6.5 cleanup commit
7 files changed