FIX: clean code - remove some unneded comparisons