clean-up dead code