Remove dead code; test coverage back to 100%