remove dead code. Increase test coverage