removed condition that would always resolve to 'true'