cleaned up dead code and unused imports