Post 2.6.5 final cleanup.
2 files changed