Remove unnecessary if state