further cleanup
2 files changed