Improved coverage by removing unused code