Remove Conditional Statement