no dead code, general clean-up