Updated RestEasy to 2.x, cleaning up utils