Remove FEAT_ comparisons