Remove commented code.
Increase test coverage.