clean-up dead-code
4 files changed