Comparator: start cleanup mess