100% test coverage
Remove dead code and make all tests pass