Code cleanup, no implementation changes
84 files changed