More cleaning up branching mistake