Remove redundant comparator classes

Github #70