Remove unused code based on coverage report - View it on GitHub