remove some branching