more cleanup
12 files changed