Remove duplicate conditional