More work on comparison removal

Not in a working state currently