Remove duplicate condition checking