Improved code coverage, but removing code