removing dead code
7 files changed