more cleanup
3 files changed