Clean up duplicate if