Removed unused Comparable interface and Comparator macros