Removed unused code
~93% code coverage