removed condition that is always true