removed some unnecessary epsilons