Removed old code for coverage reasons