More code cleanup
27 files changed