comparator was useless
Removed remnant of comparator
Added some optimisations for NO_INVALID mode in two_* and remquo