fix some warnings (unused imports), remove dead code
13 files changed